1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index d46dbaa5..432816be 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -109,6 +109,9 @@ const EmojiPicker = {
       this.customEmojiBufferSlice += LOAD_EMOJI_BY
     },
     startEmojiLoad (forceUpdate = false) {
+      this.$nextTick(() => {
+        this.$refs['emoji-groups'].scrollTop = 0
+      })
       const bufferSize = this.customEmojiBuffer.length
       const bufferPrefilledAll = bufferSize === this.filteredEmoji.length
       if (bufferPrefilledAll && !forceUpdate) {
@@ -126,7 +129,6 @@ const EmojiPicker = {
   watch: {
     keyword () {
       this.customEmojiLoadAllConfirmed = false
-      this.$refs['emoji-groups'].scrollTop = 0
       this.onScroll()
       this.startEmojiLoad(true)
     }