diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js
index fd5ab9b79..9d41c4658 100644
--- a/core/modules/utils/dom/popup.js
+++ b/core/modules/utils/dom/popup.js
@@ -180,8 +180,12 @@ Popup.prototype.cancel = function(level,focusedInputNode) {
 		}
 		if(!inputWithinPopup) {
 			var popup = this.popups.pop();
-			if(popup.title) {
-				popup.wiki.deleteTiddler(popup.title);
+		  if(popup.title) {
+			  if(popup.noStateReference) {
+				  popup.wiki.deleteTiddler(popup.title);
+			  } else {
+				  popup.wiki.deleteTiddler($tw.utils.parseTextReference(popup.title).title);
+        }
 			}
 		}
 	}