diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 9a27238fd..32e3bd6e1 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -92,6 +92,9 @@ export default {
     threadIsMuted () {
       return this.status.thread_muted
     },
+    hideCustomEmoji () {
+      return !this.$store.state.instance.pleromaCustomEmojiReactionsAvailable
+    },
     buttonInnerClass () {
       return [
         this.button.name + '-button',
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index f88554003..622f21ca5 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -51,9 +51,6 @@ const StatusActionButtons = {
     currentUser () {
       return this.$store.state.users.currentUser
     },
-    hideCustomEmoji () {
-      return !this.$store.state.instance.pleromaCustomEmojiReactionsAvailable
-    },
     funcArg () {
       return {
         status: this.status,
@@ -71,7 +68,6 @@ const StatusActionButtons = {
       return {
         title: this.$t('status.more_actions'),
         'aria-controls': `popup-menu-${this.randomSeed}`,
-        'aria-expanded': this.expanded,
         'aria-haspopup': 'menu'
       }
     }