diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 11b5b3d8..86a227ce 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -134,6 +134,10 @@
     border-bottom-style: solid;
     border-bottom-color: var(--border, $fallback--border);
     border-radius: 0;
+    /* Make the button stretch along the whole row */
+    display: flex;
+    align-items: stretch;
+    flex-direction: column;
   }
 
   /* HACK: we want the border width to scale with the status *below it* */
diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue
index 79ba0cc5..46d65101 100644
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@@ -119,5 +119,9 @@
 .thread-tree-replies-hidden {
   padding: $status-margin;
   border-top: 1px solid var(--border, $fallback--border);
+  /* Make the button stretch along the whole row */
+  display: flex;
+  align-items: stretch;
+  flex-direction: column;
 }
 </style>