diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index ac63fcdb8..0c0f482f9 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -106,11 +106,6 @@ const EmojiPicker = {
     }
   },
   inject: ['popoversZLayer'],
-  mounted () {
-    this.$nextTick(() => {
-      this.updateEmojiSize()
-    })
-  },
   data () {
     return {
       keyword: '',
@@ -249,6 +244,7 @@ const EmojiPicker = {
     onShowing () {
       const oldContentLoaded = this.contentLoaded
       this.recalculateItemPerRow()
+      this.updateEmojiSize()
       this.$nextTick(() => {
         this.$refs.search.focus()
       })