diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 5bf86a0399c..a45c8a5bc9a 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -299,7 +299,11 @@
   border-bottom: 1px solid var(--primary-low);
   width: 100%;
   box-sizing: border-box;
-  overflow-x: auto;
+
+  html:not(.keyboard-visible) & {
+    overflow-x: auto; // hiding overflow breaks the cog menu on iPad and mobile
+  }
+
   flex-shrink: 0;
 
   .d-editor-spacer {
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 0da694d7140..a3d629c407a 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -235,8 +235,3 @@
     margin-right: 6px;
   }
 }
-
-.d-editor-button-bar {
-  // can't hide overflow here because it hides the cog menu dropdown
-  overflow: unset;
-}