diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index a266ace7623..6f34c1ba75e 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -643,7 +643,6 @@ body:not(.ios-safari-composer-hacks) {
       min-height: calc(var(--min-height) - 4em);
     }
     padding-bottom: var(--composer-ipad-padding);
-    padding-bottom: calc(10px + env(keyboard-inset-height));
     box-sizing: border-box;
   }
 }
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 0d85d2caa22..dcb7b0228fb 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -23,24 +23,13 @@
   }
 
   .keyboard-visible &.open {
-    height: 100%; // Android: Reduces composer jumpiness when the keyboard toggles
-  }
-
-  .keyboard-visible body.ios-safari-composer-hacks &.open {
+    top: 0px;
     height: calc(var(--composer-vh, 1vh) * 100);
     .reply-area {
       padding-bottom: 6px;
     }
   }
 
-  // Firefox for Android hack
-  @supports (-moz-appearance: none) {
-    .keyboard-visible #reply-control.open {
-      position: sticky;
-      height: calc(100vh - var(--header-offset, 4em));
-    }
-  }
-
   .reply-to {
     justify-content: space-between;
     margin-bottom: 6px;