diff --git a/changelog.d/emoji-count-button.fix b/changelog.d/emoji-count-button.fix
new file mode 100644
index 000000000..946f6d554
--- /dev/null
+++ b/changelog.d/emoji-count-button.fix
@@ -0,0 +1 @@
+Switch from class hack to normalButton attr for emoji count popover
diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index d71dcbc4d..f5e1b68f6 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -84,8 +84,6 @@ const EmojiReactions = {
     counterTriggerAttrs (reaction) {
       return {
         class: [
-          'btn',
-          'button-default',
           'emoji-reaction-count-button',
           {
             '-picked-reaction': this.reactedWith(reaction.name),
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index ace8f82eb..e2361885a 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -52,6 +52,7 @@
       <UserListPopover
         :users="accountsForEmoji[reaction.name]"
         class="emoji-reaction-popover"
+        :normal-button="true"
         :trigger-attrs="counterTriggerAttrs(reaction)"
         @show="fetchEmojiReactionsByIfMissing()"
       >