diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 7d95ab7e..f635a033 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -88,9 +88,10 @@
     }
   }
   .emoji-picker-panel {
-    position: absolute;
+    position: relative;
     z-index: 20;
     margin-top: 2px;
+    top: 0px !important;
 
     &.hide {
       display: none
diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index 9c814e15..98b2720a 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -36,7 +36,11 @@
 
   .heading {
     margin-top: 10px;
-    height: 4.8em;
+    height: 5.8em;
+  }
+
+  .emoji-header {
+    margin-left: 5px;
   }
 
   .content {
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 408048d2..a5d6f3f7 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="emoji-picker panel panel-default panel-body">
     <div class="heading">
+      <span class="emoji-header">Emoji Packs</span>
       <span class="emoji-tabs">
         <span
           v-for="group in emojis"