diff --git a/app/assets/javascripts/repository_columns/columns_initializers/status_column_type.js b/app/assets/javascripts/repository_columns/columns_initializers/status_column_type.js
index a26eecaa6..48b4f1cbf 100644
--- a/app/assets/javascripts/repository_columns/columns_initializers/status_column_type.js
+++ b/app/assets/javascripts/repository_columns/columns_initializers/status_column_type.js
@@ -54,7 +54,7 @@ var RepositoryStatusColumnType = (function() {
         var picker = new EmojiButton({ rootElement: document.getElementById('manage-repository-column') });
         var iconElement = this;
         picker.on('emoji', emoji => {
-          $(iconElement).attr('emoji', emoji).html(twemoji.parse(emoji));
+          $(iconElement).attr('emoji', emoji.emoji).html(twemoji.parse(emoji.emoji));
           validateForm();
         });
 
@@ -63,7 +63,9 @@ var RepositoryStatusColumnType = (function() {
         } else {
           picker.showPicker(iconElement);
         }
-        twemoji.parse($('.emoji-picker').last().find('.emoji-picker__tab-body')[1]);
+        $.each($('.emoji-picker__emojis').last().find('.emoji-picker__container'), function(i, container) {
+          twemoji.parse(container);
+        });
       })
       .on('click', '.emoji-picker__tab-body.active .emoji-picker__emoji', function() {
         if ($('.emoji-picker__variant-popup').length) {
@@ -73,7 +75,7 @@ var RepositoryStatusColumnType = (function() {
       .on('click', '.emoji-picker__tab', function() {
         $.each($('.emoji-picker__tab'), (i, tab) => {
           if ($(tab).hasClass('active')) {
-            twemoji.parse($('.emoji-picker__tab-body')[i]);
+            twemoji.parse($('.emoji-picker__container')[i]);
           }
         });
       });
diff --git a/app/assets/stylesheets/repository_columns/status_type.scss b/app/assets/stylesheets/repository_columns/status_type.scss
index 95c593352..cd8ec745f 100644
--- a/app/assets/stylesheets/repository_columns/status_type.scss
+++ b/app/assets/stylesheets/repository_columns/status_type.scss
@@ -168,7 +168,7 @@
   }
 
   .emoji-picker__emojis {
-    height: 14rem;
+    height: 28rem;
   }
 
   .emoji-picker__variant-popup {
diff --git a/app/javascript/packs/emoji_button.js b/app/javascript/packs/emoji_button.js
index 264de486a..b7810fab8 100644
--- a/app/javascript/packs/emoji_button.js
+++ b/app/javascript/packs/emoji_button.js
@@ -1,4 +1,7 @@
 global.twemoji = require('twemoji').default;
 global.twemoji.base = '/images/twemoji/';
 global.twemoji.size = '24x24';
-global.EmojiButton = require('@joeattardi/emoji-button/dist/index');
+
+import { EmojiButton } from '@joeattardi/emoji-button';
+
+global.EmojiButton = EmojiButton;