diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index 45dac0dc1..a86c6044b 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -105,6 +105,9 @@ const StatusActionButtons = {
         .catch(err => this.$emit('onError', err.error.error))
         .finally(() => setTimeout(() => { this.animationState[button.name] = false }))
     },
+    onExtraClose () {
+      this.showPin = false
+    },
     isPinned (button) {
       return this.pinnedItems.has(button.name)
     },
diff --git a/src/components/status_action_buttons/status_action_buttons.vue b/src/components/status_action_buttons/status_action_buttons.vue
index 4ee11f4b9..81e000e7b 100644
--- a/src/components/status_action_buttons/status_action_buttons.vue
+++ b/src/components/status_action_buttons/status_action_buttons.vue
@@ -42,8 +42,7 @@
         placement="top"
         :offset="{ y: 5 }"
         remove-padding
-        @show="onShow"
-        @close="onClose"
+        @close="onExtraClose"
       >
         <template #trigger>
           <FAIcon