diff --git a/public/js/icinga/behavior/modal.js b/public/js/icinga/behavior/modal.js
index f08c87cfc..a60a42566 100644
--- a/public/js/icinga/behavior/modal.js
+++ b/public/js/icinga/behavior/modal.js
@@ -148,7 +148,7 @@
     Modal.prototype.onKeyDown = function(event) {
         var _this = event.data.self;
 
-        if (event.which === 27) {
+        if (! event.isDefaultPrevented() && event.key === 'Escape') {
             _this.hide(_this.$layout.children('#modal'));
         }
     };