diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index b44d675d..e8320273 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -35,8 +35,8 @@
   }
 
   .heading {
-    overflow-x: auto;
     margin-top: 10px;
+    height: 4.8em;
   }
 
   .content {
@@ -64,9 +64,13 @@
 
   .additional-tabs,
   .emoji-tabs {
+    position: absolute;
     display: flex;
     flex-wrap: nowrap;
 
+    overflow: auto;
+    width: 100%;
+
     &-item {
       display: flex;
       align-items: center;