diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss
index 6f1ce23b6..8eafd8c49 100644
--- a/app/assets/stylesheets/components/navigation.scss
+++ b/app/assets/stylesheets/components/navigation.scss
@@ -15,24 +15,40 @@
     }
 
     &-switch {
+
       @include core-16;
       text-align: right;
       position: absolute;
       top: 0;
       right: 0;
       padding: 13px 0 9px 15px;
+
+      &:focus {
+        outline: none;
+        border-bottom: 4px solid $yellow;
+        border-left: 10px solid $yellow;
+        border-right: 3px solid $yellow;
+        right: -3px;
+        color: $text-colour;
+      }
+
     }
 
   }
 
   li {
     @include core-19;
-    margin: 10px 0 0 0;
+    margin: 0;
     list-style-type: none;
   }
 
   a {
 
+    display: block;
+    padding: 5px 0;
+    position: relative;
+    top: 5px;
+
     &:link,
     &:visited {
       text-decoration: none;
@@ -43,6 +59,10 @@
       text-decoration: underline;
     }
 
+    &:focus {
+      color: $text-colour;
+    }
+
   }
 
 }