1 files changed, 9 insertions, 1 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index cab952f8..322bb8ba 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -58,7 +58,8 @@ const EmojiPicker = {
       customEmojiBufferSlice: LOAD_EMOJI_BY,
       customEmojiTimeout: null,
       customEmojiLoadAllConfirmed: false,
-      groupLoadedCount: {}
+      groupLoadedCount: {},
+      firstLoaded: false
     }
   },
   components: {
@@ -167,6 +168,13 @@ const EmojiPicker = {
       }
       this.$nextTick(() => {
         this.$refs['emoji-groups'].scrollTop = 0
+        this.$nextTick(() => {
+          if (this.firstLoaded) {
+            return
+          }
+          this.triggerLoadMore(this.$refs['emoji-groups'])
+          this.firstLoaded = true
+        })
       })
       const bufferSize = this.customEmojiBuffer.length
       const bufferPrefilledAll = bufferSize === this.filteredEmoji.length