diff --git a/scss/modules/emojis/_current_status.scss b/scss/modules/emojis/_current_status.scss
index 7eb9ad03..bc8879e1 100644
--- a/scss/modules/emojis/_current_status.scss
+++ b/scss/modules/emojis/_current_status.scss
@@ -30,13 +30,6 @@
       color: $base-font-color;
     }
   }
-
-  &.focus ~ {
-    #primary_file_button:not(:hover):not(.active),
-    .emo_menu {
-      color: $base-font-color;
-    }
-  }
 }
 
 .current_status_emoji_picker {
diff --git a/scss/modules/inputs/_messaging.scss b/scss/modules/inputs/_messaging.scss
index 10f3457d..bb16e339 100644
--- a/scss/modules/inputs/_messaging.scss
+++ b/scss/modules/inputs/_messaging.scss
@@ -67,6 +67,10 @@
     }
   }
 
+  + #primary_file_button:not(:hover):not(.active) {
+    border-color: $color-shade-mid;
+  }
+
   &.offline:not(.pretend-to-be-online) {
     background-color: $color-shade-dark !important;
     color: $color-highlight;