diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index fb161440eb..f1836fd472 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -39,7 +39,8 @@
 					return;
 				}
 				// Escape
-				if(event.keyCode === 27 && self.options.closeOnEscape) {
+				if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) {
+					event.stopImmediatePropagation();
 					self.close();
 					return false;
 				}