diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 3cb41039cf..9eba80542c 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -84,8 +84,8 @@ phpbb.alert = function(title, msg, fadedark) {
 		e.stopPropagation();
 	});
 
-	$(document).bind('keydown', function(e) {
-		if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) {
+	$(document).keydown(function(e) {
+		if ((e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) && dark.is(':visible')) {
 			dark.trigger('click');
 
 			e.preventDefault();