diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index e8320273..9c814e15 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -65,17 +65,19 @@
   .additional-tabs,
   .emoji-tabs {
     position: absolute;
-    display: flex;
+    display: block;
     flex-wrap: nowrap;
 
     overflow: auto;
     width: 100%;
 
+    white-space: nowrap;
+    
     &-item {
-      display: flex;
+      vertical-align: top;
+      display: inline-flex;
       align-items: center;
       justify-content: center;
-      flex-shrink: 0;
       width: 32px;
       height: 32px;
       padding: .4em;