diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 2cf288bdd..2e84c2d11 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -177,9 +177,9 @@ define([
                     }
                 },
                 //remove focus from editor
-                "Shift-Enter": function () {
+                "Esc": function () {
                     document.activeElement.blur();
-                    document.querySelector('[tabindex="0"]').focus();
+                    document.querySelector('.cp-toolbar-link-logo').focus();
                 },
                 "Shift-Tab": function () {
                     editor.execCommand("indentLess");