diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/utill/hotkey.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/utill/hotkey.directive.js
index 39a565b7ab..2ed1c87220 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/utill/hotkey.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/utill/hotkey.directive.js
@@ -16,7 +16,8 @@ angular.module("umbraco.directives")
 
           keyboardService.bind(keyCombo, function() {
               var element = $(el);
-              if(element.is("a,button,input[type='button'],input[type='submit']")){
+
+              if(element.is("a,button,input[type='button'],input[type='submit']") && !element.is(':disabled') ){
                 element.click();
               }else{
                 element.focus();