diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js
index 7411a6d8b..d44da6779 100644
--- a/core/modules/utils/dom/popup.js
+++ b/core/modules/utils/dom/popup.js
@@ -158,7 +158,11 @@ Popup.prototype.cancel = function(level) {
 	for(var t=level; t<numPopups; t++) {
 		var popup = this.popups.pop();
 		if(popup.title) {
-			popup.wiki.deleteTiddler(popup.title);
+			if(popup.noStateReference) {
+				popup.wiki.deleteTiddler(popup.title);
+			} else {
+				popup.wiki.deleteTiddler($tw.utils.parseTextReference(popup.title).title);
+			}
 		}
 	}
 	if(this.popups.length === 0) {