diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index e315d2d7f0..ea8b603782 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -57,9 +57,7 @@ $emoji-picker-emoji-size: 32px;
 
   .heading {
     display: flex;
-    //height: $emoji-picker-header-height;
     padding: 10px 7px 5px;
-    overflow-x: auto;
   }
 
   .content {
@@ -74,6 +72,7 @@ $emoji-picker-emoji-size: 32px;
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
+    overflow-x: auto;
   }
 
   .emoji-groups {
@@ -81,7 +80,8 @@ $emoji-picker-emoji-size: 32px;
   }
 
   .additional-tabs {
-    display: block;
+    display: flex;
+    flex: 1;
     border-left: 1px solid;
     border-left-color: $fallback--icon;
     border-left-color: var(--icon, $fallback--icon);
@@ -91,9 +91,8 @@ $emoji-picker-emoji-size: 32px;
 
   .additional-tabs,
   .emoji-tabs {
-    min-width: 0;
     flex-basis: auto;
-    flex-shrink: 1;
+    // flex-shrink: 1;
     display: flex;
     align-content: center;