diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 41089dbe1..8e360e18c 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -274,6 +274,10 @@ $table-header:   #ecf1f6;
       border: $admin-border;
       border-radius: rem-calc(6);
       box-shadow: none;
+
+      &:focus {
+        border: $input-border-focus;
+      }
     }
   }
 
diff --git a/app/assets/stylesheets/layout/locale_switcher.scss b/app/assets/stylesheets/layout/locale_switcher.scss
index aedd5b909..8fffc6868 100644
--- a/app/assets/stylesheets/layout/locale_switcher.scss
+++ b/app/assets/stylesheets/layout/locale_switcher.scss
@@ -39,6 +39,7 @@
       width: auto;
 
       &:focus {
+        border: 0;
         outline: $outline-focus;
       }