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/status_action_buttons/status_action_buttons.scss b/src/components/status_action_buttons/status_action_buttons.scss
index 3a5dae33f..e18083513 100644
--- a/src/components/status_action_buttons/status_action_buttons.scss
+++ b/src/components/status_action_buttons/status_action_buttons.scss
@@ -3,10 +3,10 @@
 .StatusActionButtons {
   .quick-action-buttons {
     display: grid;
-    grid-template-columns: 1fr;
-    grid-auto-flow: column;
-    grid-auto-columns: 1fr;
-    grid-gap: 1em;
+    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);
   }
 }
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index 70a76d54c..334e2a903 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;
 }