diff --git a/src/App.scss b/src/App.scss
index 1b781304e..081ce2fdb 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -339,6 +339,8 @@ nav {
     grid-template-areas: "content";
     padding: 0;
 
+    --_actionsColumnCount: 3;
+
     .column {
       padding-top: 0;
       margin: var(--navbar-height) 0 0 0;
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 242068109..6b49cf682 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -275,11 +275,6 @@ const Popover = {
       this.scrollable.removeEventListener('scroll', this.onScroll)
       this.scrollable.removeEventListener('resize', this.onResize)
     },
-    resizePopover () {
-      setTimeout(() => {
-        this.updateStyles()
-      }, 1)
-    },
     onMouseenter (e) {
       if (this.trigger === 'hover') {
         this.lockReEntry = false
@@ -328,12 +323,7 @@ const Popover = {
       this.updateStyles()
     },
     onResize (e) {
-      const content = this.$refs.content
-      if (!content) return
-      if (this.oldSize.width !== content.offsetWidth || this.oldSize.height !== content.offsetHeight) {
-        this.updateStyles()
-        this.oldSize = { width: content.offsetWidth, height: content.offsetHeight }
-      }
+      this.updateStyles()
     },
     onChildPopoverState (childRef, state) {
       if (state) {
@@ -347,7 +337,12 @@ const Popover = {
     // Monitor changes to content size, update styles only when content sizes have changed,
     // that should be the only time we need to move the popover box if we don't care about scroll
     // or resize
-    this.onResize()
+    const content = this.$refs.content
+    if (!content) return
+    if (this.oldSize.width !== content.offsetWidth || this.oldSize.height !== content.offsetHeight) {
+      this.updateStyles()
+      this.oldSize = { width: content.offsetWidth, height: content.offsetHeight }
+    }
   },
   mounted () {
     this.teleport = true
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index f91abc3f0..33817fa6a 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -33,7 +33,6 @@
             name="content"
             class="popover-inner"
             :close="hidePopover"
-            :resize="resizePopover"
           />
         </div>
       </transition>
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 193a96ee9..b87e07687 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -112,12 +112,11 @@ export default {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
     },
-    doActionWrap (button, close) {
+    doActionWrap (button) {
       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.scss b/src/components/status_action_buttons/action_button.scss
index 14bfdfa9d..fe4983946 100644
--- a/src/components/status_action_buttons/action_button.scss
+++ b/src/components/status_action_buttons/action_button.scss
@@ -3,15 +3,15 @@
 
 .quick-action {
   display: grid;
-  grid-template-columns: minmax(max-content, 1fr);
+  grid-template-columns: max-content;
   grid-gap: 0.25em;
-  align-items: center;
-  height: 1.5em;
 
-  .action-counter {
-    overflow-x: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  &.-pin {
+    margin: calc(-2px - 0.25em);
+    padding: 0.25em;
+    border: 2px dashed var(--icon);
+    border-radius: var(--roundness);
+    grid-template-columns: 1fr auto;
   }
 
   .action-button-inner,
@@ -21,30 +21,21 @@
   }
 
   .separator {
-    display: block;
-    align-self: stretch;
-    width: 1px;
-    background-color: var(--icon);
-    margin-right: 0.5em;
-  }
+    width: 0.5em;
 
-  &.-pin {
-    margin: calc(-2px - 0.25em);
-    padding: 0.25em;
-    border: 2px dashed var(--icon);
-    border-radius: var(--roundness);
-    grid-template-columns: minmax(max-content, 1fr) auto;
-
-    .extra-button,
-    .separator {
-      display: none;
+    &::before {
+      content: "";
+      display: block;
+      width: 1px;
+      height: 1.5em;
+      background-color: var(--icon);
     }
   }
 
   .action-button-inner {
     display: grid;
     grid-gap: 1em;
-    grid-template-columns: max-content 1fr;
+    grid-template-columns: max-content max-content;
     grid-auto-flow: column;
     grid-auto-columns: max-content;
     align-items: center;
@@ -54,7 +45,6 @@
 .action-button {
   display: grid;
   grid-auto-flow: column;
-  align-items: center;
   padding: 0;
 
   .action-button-inner {
diff --git a/src/components/status_action_buttons/action_button.vue b/src/components/status_action_buttons/action_button.vue
index b9dca8818..40d3397c5 100644
--- a/src/components/status_action_buttons/action_button.vue
+++ b/src/components/status_action_buttons/action_button.vue
@@ -8,12 +8,11 @@
       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="doActionWrap(button, close)"
+      @click.prevent="doActionWrap(button)"
+      @click="button.name === 'emoji' ? () => {} : 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 407fd15fe..0cde21efc 100644
--- a/src/components/status_action_buttons/action_button_container.vue
+++ b/src/components/status_action_buttons/action_button_container.vue
@@ -6,6 +6,7 @@
       v-if="button.dropdown?.()"
     >
       <template #trigger>
+        {{ props }}
         <ActionButton
           :button="button"
           :status="status"
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index a86c6044b..45dac0dc1 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -105,9 +105,6 @@ 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.scss b/src/components/status_action_buttons/status_action_buttons.scss
index 4acf4a072..e18083513 100644
--- a/src/components/status_action_buttons/status_action_buttons.scss
+++ b/src/components/status_action_buttons/status_action_buttons.scss
@@ -3,17 +3,11 @@
 .StatusActionButtons {
   .quick-action-buttons {
     display: grid;
-    grid-template-columns: repeat(auto-fill, 5em);
+    grid-template-columns: repeat(var(--_actionsColumnCount, 6), 1fr);
     grid-auto-flow: row dense;
     grid-auto-rows: 1fr;
     grid-gap: 1.25em 1em;
     margin-top: var(--status-margin);
-    align-items: baseline;
-  }
-
-  .pin-action-button {
-    margin: -0.5em;
-    padding: 0.5em;
   }
 }
 // popover
diff --git a/src/components/status_action_buttons/status_action_buttons.vue b/src/components/status_action_buttons/status_action_buttons.vue
index 81e000e7b..a3b50975a 100644
--- a/src/components/status_action_buttons/status_action_buttons.vue
+++ b/src/components/status_action_buttons/status_action_buttons.vue
@@ -16,7 +16,7 @@
           :get-class="getClass"
           :get-component="getComponent"
           :animation-state="animationState"
-          :close="() => {}"
+          :close="close"
           :do-action="doAction"
         />
         <button
@@ -41,8 +41,10 @@
         :tabindex="0"
         placement="top"
         :offset="{ y: 5 }"
+        :bound-to="{ x: 'container' }"
         remove-padding
-        @close="onExtraClose"
+        @show="onShow"
+        @close="onClose"
       >
         <template #trigger>
           <FAIcon
@@ -50,7 +52,7 @@
             icon="ellipsis-h"
           />
         </template>
-        <template #content="{close, resize}">
+        <template #content="{close}">
           <div
             :id="`popup-menu-${randomSeed}`"
             class="dropdown-menu extra-action-buttons"
@@ -61,7 +63,7 @@
                 class="main-button"
                 role="menuitem"
                 :tabindex="0"
-                @click.stop="() => { resize(); showPin = !showPin }"
+                @click.stop="showPin = !showPin"
               >
                 <FAIcon
                   class="fa-scale-110"
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index 843f46e4c..13ef610c6 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -292,6 +292,10 @@
   }
 }
 
+#sidebar {
+  --_actionsColumnCount: 4;
+}
+
 .sidebar .edit-profile-button {
   display: none;
 }