diff --git a/apps/common/main/lib/extend/Bootstrap.js b/apps/common/main/lib/extend/Bootstrap.js
index 88d24f543..f5ae4fedc 100755
--- a/apps/common/main/lib/extend/Bootstrap.js
+++ b/apps/common/main/lib/extend/Bootstrap.js
@@ -57,7 +57,7 @@ function onDropDownKeyDown(e) {
             }
         }
     } else if ($this.hasClass('move-focus')) {
-        if (!(/^(27|13|9|32)/.test(e.keyCode) && !e.ctrlKey && !e.altKey)) {
+        if (!((/^(13|9|32)/.test(e.keyCode) || e.keyCode===27 && !$parent.hasClass('open')) && !e.ctrlKey && !e.altKey)) {
             patchDropDownKeyDown.call(this, e);
             e.preventDefault();
             e.stopPropagation();
diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js
index 25e84cd04..7985f3dbc 100644
--- a/apps/documenteditor/forms/app/controller/ApplicationController.js
+++ b/apps/documenteditor/forms/app/controller/ApplicationController.js
@@ -646,6 +646,10 @@ define([
                     this.submitedTooltip.show();
                 }
             }
+             if ( type == Asc.c_oAscAsyncActionType.BlockInteraction &&
+                 !((id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges'] || id == Asc.c_oAscAsyncAction['DownloadAs']) && Common.Utils.ModalWindow.isVisible()) ) {
+                 this.api.asc_enableKeyEvents(true);
+             }
         },
 
         onDocMouseMoveStart: function() {