diff --git a/web/styles/compose.css b/web/styles/compose.css
index e82aa52d69..45467ae7ae 100644
--- a/web/styles/compose.css
+++ b/web/styles/compose.css
@@ -1154,6 +1154,12 @@ textarea.new_message_textarea {
            --compose-formatting-buttons-row-height */
         /* 28px at 20px/1em */
         height: 1.4em;
+
+        @media (width < 400px) {
+            /* Remove at mobile widths to make more space
+               for compose buttons */
+            display: none;
+        }
     }
 
     .compose_draft_button {
@@ -1231,6 +1237,14 @@ textarea.new_message_textarea {
                 display: flex;
             }
         }
+
+        .compose_control_button {
+            /* Slightly reduce width so that buttons don't overflow the available
+            space at mobile widths */
+            @media (width < 400px) {
+                width: 1.28em;
+            }
+        }
     }
 }