diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 08acae6e1..ea0131b65 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -108,10 +108,11 @@ exports.addTiddler = function(tiddler,isShadow) {
 	if(!(tiddler instanceof $tw.Tiddler)) {
 		tiddler = new $tw.Tiddler(tiddler);
 	}
-	if(isShadow) {
+	var title = tiddler.fields.title,
+		prevTiddler = this.tiddlers[title];
+	if(isShadow || (prevTiddler && prevTiddler.isShadow)) {
 		tiddler.isShadow = true;
 	}
-	var title = tiddler.fields.title;
 	this.tiddlers[title] = tiddler;
 	this.clearCache(title);
 	this.touchTiddler(title);