diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index b87e07687..193a96ee9 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -112,11 +112,12 @@ export default {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
     },
-    doActionWrap (button) {
+    doActionWrap (button, close) {
       if (button.name === 'emoji') {
         this.$refs.picker.showPicker()
       } else {
         this.getComponent(button) === 'button' && this.doAction(button)
+        close()
       }
     }
   }
diff --git a/src/components/status_action_buttons/action_button.vue b/src/components/status_action_buttons/action_button.vue
index 40d3397c5..b9dca8818 100644
--- a/src/components/status_action_buttons/action_button.vue
+++ b/src/components/status_action_buttons/action_button.vue
@@ -8,11 +8,12 @@
       class="action-button-inner"
       :class="buttonInnerClass"
       role="menuitem"
+      type="button"
+      target="_blank"
       :tabindex="0"
       :disabled="buttonClass.disabled"
       :href="getComponent(button) == 'a' ? button.link?.(funcArg) || getRemoteInteractionLink : undefined"
-      @click.prevent="doActionWrap(button)"
-      @click="button.name === 'emoji' ? () => {} : close()"
+      @click="doActionWrap(button, close)"
     >
       <FALayers>
         <FAIcon
diff --git a/src/components/status_action_buttons/action_button_container.vue b/src/components/status_action_buttons/action_button_container.vue
index 0cde21efc..407fd15fe 100644
--- a/src/components/status_action_buttons/action_button_container.vue
+++ b/src/components/status_action_buttons/action_button_container.vue
@@ -6,7 +6,6 @@
       v-if="button.dropdown?.()"
     >
       <template #trigger>
-        {{ props }}
         <ActionButton
           :button="button"
           :status="status"