diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
index 3ca5cd2b2c..269e269be8 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
@@ -26,8 +26,15 @@ function MainController($scope, $location, appState, treeService, notificationsS
         if (evt.keyCode === 9) {
             $scope.tabbingActive = true;
             window.removeEventListener('keydown', handleFirstTab);
+            window.addEventListener('mousedown', disableTabbingActive);
         }
     }
+    
+    function disableTabbingActive(evt) {
+        $scope.tabbingActive = false;
+        window.removeEventListener('mousedown', disableTabbingActive);
+        window.addEventListener("keydown", handleFirstTab);
+    }
 
     window.addEventListener("keydown", handleFirstTab);