diff --git a/core/modules/rendertree/wikirendertree.js b/core/modules/rendertree/wikirendertree.js
index d862c9bbd..fea421f3c 100644
--- a/core/modules/rendertree/wikirendertree.js
+++ b/core/modules/rendertree/wikirendertree.js
@@ -129,11 +129,14 @@ WikiRenderTree.prototype.checkContextRecursion = function(renderer,newContext) {
 };
 
 WikiRenderTree.prototype.getContextScopeId = function(renderer) {
-	var guidBits = [];
+	var guidBits = [],
+		scopeComponents = ["tiddlerTitle","templateTitle"];
 	while(renderer) {
 		if(renderer.context) {
 			$tw.utils.each(renderer.context,function(field,name) {
-				guidBits.push(name + ":" + field + ";");
+				if(scopeComponents.indexOf(name) !== -1) {
+					guidBits.push(name + ":" + field + ";");
+				}
 			});
 			guidBits.push("-");
 		}