diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js
index 61e49f02..a98c6a53 100644
--- a/plugins/c9.ide.dialog/dialog.js
+++ b/plugins/c9.ide.dialog/dialog.js
@@ -133,9 +133,9 @@ define(function(require, module, exports) {
                     emit("resize");
                 });
                 var escHandler = function(e) {
-                    if (dialog.visible) {
+                    if (dialog.visible && e.keyCode == 27) {
                         dialog.dispatchEvent("keydown", e);
-                        if (e.keyCode == 27) e.stopPropagation();
+                        e.stopPropagation();
                     }
                 };
                 var addEscHandler = function() {