diff --git a/scm-ui/ui-styles/src/components/_main.scss b/scm-ui/ui-styles/src/components/_main.scss
index 6c45d026c7..1a219b5781 100644
--- a/scm-ui/ui-styles/src/components/_main.scss
+++ b/scm-ui/ui-styles/src/components/_main.scss
@@ -316,6 +316,25 @@ a.has-text-secondary-most:focus {
   }
 }
 
+a {
+  &:focus,
+  &.is-focused {
+    outline: $focus-outline-color 2px solid;
+    outline-offset: 1px;
+  }
+}
+
+button, .button {
+  &:focus,
+  &.is-focused {
+    outline: $focus-outline-color $focus-outline-style;
+    outline-offset: $focus-outline-offset;
+    &:not(:active) {
+      box-shadow: none !important;
+    }
+  }
+}
+
 // buttons
 .button {
   padding-left: 1.5em;
@@ -334,16 +353,6 @@ a.has-text-secondary-most:focus {
     }
   }
 
-  &:focus,
-  &.is-focused {
-    outline: $focus-outline-style;
-    outline-color: $focus-outline-color;
-    outline-offset: $focus-outline-offset;
-    &:not(:active) {
-      box-shadow: none !important;
-    }
-  }
-
   &.is-primary:hover,
   &.is-primary.is-hovered {
     background-color: scale-color($primary, $lightness: -10%);