diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js
index 6904359fbf..a7b437f950 100755
--- a/src/definitions/modules/modal.js
+++ b/src/definitions/modules/modal.js
@@ -611,12 +611,12 @@ $.fn.modal = function(parameters) {
                   duration    : settings.transition.hideDuration || settings.duration,
                   useFailSafe : true,
                   onStart     : function() {
-                    if(!module.others.active() && !module.others.animating() && !keepDimmed) {
-                      module.hideDimmer();
-                    }
                     if( settings.keyboardShortcuts && !module.others.active() ) {
                       module.remove.keyboardShortcuts();
                     }
+                    if(!module.others.active() && !module.others.animating() && !keepDimmed) {
+                      module.hideDimmer();
+                    }
                   },
                   onComplete : function() {
                     module.unbind.scrollLock();
@@ -630,6 +630,9 @@ $.fn.modal = function(parameters) {
                       else {
                         $previousModal.find(selector.dimmer).removeClass('active');
                       }
+                      if(!module.others.active() && !module.others.animating() && !keepDimmed) {
+                        module.hideDimmer();
+                      }
                     }
                     if($.isFunction(settings.onHidden)) {
                       settings.onHidden.call(element);