diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
index 86ead685b8..d4b21e66f0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
@@ -25,12 +25,27 @@
     height: @appHeaderHeight;
 }
 
-.umb-app-header__action a:hover,
-.umb-app-header__action a:focus {
+.umb-app-header__action a {
     outline: none;
+    &:focus {
+        .tabbing-active & {
+            .umb-app-header__action-icon::after {
+                content: '';
+                position: absolute;
+                z-index:10000;
+                top: -7px;
+                left: -7px;
+                width: 36px;
+                height: 35px;
+                border-radius: 3px;
+                box-shadow: 0 0 2px @pinkLight, inset 0 0 2px 1px @pinkLight;
+            }
+        }
+    }
 }
 
 .umb-app-header__action-icon {
+    position: relative;
     opacity: 0.8;
     color: @white;
     font-size: 22px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index f7e6e5ec79..5a1de02617 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -65,11 +65,9 @@ ul.sections>li>a:focus .section__name {
 }
 
 ul.sections>li>a:focus .section__name {
-    box-shadow: 0 0 2px @pinkLight, inset 0 0 2px 1px @pinkLight;
-}
-ul.sections>li>a:hover .section__name,
-ul.sections>li.current>a:focus .section__name {
-    box-shadow: none;
+    .tabbing-active & {
+        box-shadow: 0 0 2px @pinkLight, inset 0 0 2px 1px @pinkLight;
+    }
 }