diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 3ebee34ed27..54aa976c0c0 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1008,11 +1008,13 @@ a.mention-group {
   padding: 0.5em 0;
 
   .topic-footer-main-buttons {
-    margin: -0.5em 0;
+    margin: 0 0 -0.5em 0;
+    display: flex;
+    flex-wrap: wrap;
 
     > .btn,
     .topic-admin-menu-button-container {
-      margin: 0.5em 0.5em 0.5em 0;
+      margin: 0 0.5em 0.5em 0;
     }
 
     .topic-admin-menu-button-container {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index f6fa70b25a4..db68682303d 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -241,7 +241,7 @@ a.reply-to-tab {
   }
 
   .topic-footer-mobile-dropdown {
-    margin-right: 0.5em;
+    margin: 0 0.5em 0.5em 0;
     width: 160px;
   }