diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index 3bf9e9a3a..1dfb33ee8 100644
--- a/chrome/content/zotero/integration/quickFormat.js
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -1157,7 +1157,11 @@ var Zotero_QuickFormat = new function () {
 			.getService(Components.interfaces.nsIWindowWatcher)
 			.openWindow(null, 'chrome://zotero/content/integration/addCitationDialog.xul',
 			'', 'chrome,centerscreen,resizable', io);
-		newWindow.addEventListener("load", function() { window.close(); }, false);
+		newWindow.addEventListener("focus", function() {
+			newWindow.removeEventListener("focus", arguments.callee, true);
+			window.close();
+		}, true);
+		accepted = true;
 	}
 	
 	/**