diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 2e84c2d11..aa1bde788 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -178,8 +178,7 @@ define([
                 },
                 //remove focus from editor
                 "Esc": function () {
-                    document.activeElement.blur();
-                    document.querySelector('.cp-toolbar-link-logo').focus();
+                    editor.display.input.blur();
                 },
                 "Shift-Tab": function () {
                     editor.execCommand("indentLess");