diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index 6e3249300..a96b77ddb 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -814,7 +814,7 @@ define([
                         }
                     }
 
-                    Common.NotificationCenter.trigger('modal:close', this);
+                    Common.NotificationCenter.trigger('modal:close', this, hide_mask);
                 }
 
                 this.$window.remove();
@@ -854,7 +854,7 @@ define([
                                 }
                             }
                         }
-                        Common.NotificationCenter.trigger('modal:hide', this);
+                        Common.NotificationCenter.trigger('modal:hide', this, hide_mask);
                     }
                     this.$window.hide();
                     this.$window.removeClass('notransform');
diff --git a/apps/common/main/lib/util/Shortcuts.js b/apps/common/main/lib/util/Shortcuts.js
index 430646a83..f34ae1ce5 100644
--- a/apps/common/main/lib/util/Shortcuts.js
+++ b/apps/common/main/lib/util/Shortcuts.js
@@ -99,11 +99,11 @@ Common.util = Common.util||{};
                 'modal:show': function(e){
                     window.key.suspend();
                 },
-                'modal:close': function(e) {
-                    window.key.resume();
+                'modal:close': function(e, last) {
+                    last && window.key.resume();
                 },
-                'modal:hide': function(e) {
-                    window.key.resume();
+                'modal:hide': function(e, last) {
+                    last && window.key.resume();
                 }
             });
         },