diff --git a/components/emoji_picker/emoji_picker_tabs.jsx b/components/emoji_picker/emoji_picker_tabs.jsx
index db4dd8ab4bbe..eda501c3bddc 100644
--- a/components/emoji_picker/emoji_picker_tabs.jsx
+++ b/components/emoji_picker/emoji_picker_tabs.jsx
@@ -120,8 +120,9 @@ export default class EmojiPickerTabs extends PureComponent {
             <div
                 id='emojiPicker'
                 style={pickerStyle}
-                className={pickerClass}
+                className={pickerClass + ' emoji-picker--single'}
             >
+                <EmojiPickerHeader handleEmojiPickerClose={this.handleEmojiPickerClose}/>
                 <EmojiPicker
                     style={this.props.style}
                     onEmojiClose={this.props.onEmojiClose}
diff --git a/sass/responsive/_mobile.scss b/sass/responsive/_mobile.scss
index 16d874d091ba..839b9f9d0177 100644
--- a/sass/responsive/_mobile.scss
+++ b/sass/responsive/_mobile.scss
@@ -1787,6 +1787,15 @@
         }
     }
 
+    .emoji-picker {
+        &.emoji-picker--single {
+            .emoji-picker__inner {
+                margin-top: 59px;
+                height: calc(100vh - 60px);
+            }
+        }
+    }
+
     .sidebar--right {
         .post {
             &.post--compact {