diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js
index 16b8f0316..5c867f74d 100644
--- a/core/modules/startup/windows.js
+++ b/core/modules/startup/windows.js
@@ -84,11 +84,8 @@ exports.startup = function() {
 			name: "keydown",
 			handlerObject: $tw.keyboardManager,
 			handlerMethod: "handleKeydownEvent"
-		},{
-			name: "click",
-			handlerObject: $tw.popup,
-			handlerMethod: "handleEvent"
 		}]);
+		srcWindow.document.documentElement.addEventListener("click",$tw.popup,true);
 		srcWindow.haveInitialisedWindow = true;
 	});
 	// Close open windows when unloading main window