diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js
index 25f14e612..5096d13bb 100644
--- a/core/modules/utils/dom/popup.js
+++ b/core/modules/utils/dom/popup.js
@@ -31,12 +31,7 @@ Trigger a popup open or closed. Parameters are in a hashmap:
 */
 Popup.prototype.triggerPopup = function(options) {
 	// Check if this popup is already active
-	var index = -1;
-	for(var t=0; t<this.popups.length; t++) {
-		if(this.popups[t].title === options.title) {
-			index = t;
-		}
-	}
+	var index = this.findPopup(options.title);
 	// Compute the new state
 	var state = index === -1;
 	if(options.force !== undefined) {
@@ -50,6 +45,16 @@ Popup.prototype.triggerPopup = function(options) {
 	}
 };
 
+Popup.prototype.findPopup = function(title) {
+	var index = -1;
+	for(var t=0; t<this.popups.length; t++) {
+		if(this.popups[t].title === title) {
+			index = t;
+		}
+	}
+	return index;
+};
+
 Popup.prototype.handleEvent = function(event) {
 	if(event.type === "click") {
 		// Find out what was clicked on
@@ -107,12 +112,14 @@ Popup.prototype.show = function(options) {
 	var info = this.popupInfo(options.domNode);
 	// Cancel any higher level popups
 	this.cancel(info.popupLevel);
-	// Store the popup details
-	this.popups.push({
-		title: options.title,
-		wiki: options.wiki,
-		domNode: options.domNode
-	});
+	// Store the popup details if not already there
+	if(this.findPopup(options.title) === -1) {
+		this.popups.push({
+			title: options.title,
+			wiki: options.wiki,
+			domNode: options.domNode
+		});
+	}
 	// Set the state tiddler
 	options.wiki.setTextReference(options.title,
 			"(" + options.domNode.offsetLeft + "," + options.domNode.offsetTop + "," +