diff --git a/src/components/header/_header.scss b/src/components/header/_header.scss
index 44c6e7c60d..8a012b0af4 100644
--- a/src/components/header/_header.scss
+++ b/src/components/header/_header.scss
@@ -87,14 +87,6 @@
                 }
             }
         }
-        &__org-logo-link:focus {
-            background-color: transparent;
-            box-shadow: none;
-            outline: 3px solid var(--ons-color-focus);
-            .ons-icon--logo {
-                fill: var(--ons-color-text-link-focus);
-            }
-        }
         &__grid-top {
             color: var(--ons-color-text-inverse);
             min-height: 36px;
@@ -103,6 +95,12 @@
                 &:hover {
                     text-decoration: underline solid var(--ons-color-text-inverse-link-hover) 3px;
                 }
+                &:focus {
+                    color: var(--ons-color-text-link-focus);
+                    &:hover {
+                        text-decoration: none;
+                    }
+                }
             }
         }
     }
@@ -125,6 +123,9 @@
                 &:hover {
                     text-decoration: underline solid var(--ons-color-header-masthead-neutral) 3px;
                 }
+                &:focus:hover {
+                    text-decoration: none;
+                }
             }
         }