diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 2bbb6f215b5..b306dd70bb8 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -679,7 +679,6 @@ div.ac-wrap {
 
       &.draft,
       &.saving {
-        z-index: z("ipad-header-nav") + 1;
         padding-bottom: env(safe-area-inset-bottom);
       }
 
@@ -732,6 +731,16 @@ div.ac-wrap {
     bottom: unset;
   }
 
+  &.footer-nav-visible {
+    #reply-control.draft,
+    #reply-control.saving {
+      margin-top: calc(
+        (var(--footer-nav-height) + env(safe-area-inset-bottom)) * -1
+      );
+      padding-bottom: 0;
+    }
+  }
+
   // When an element (input, textearea) gets focus, iOS Safari tries to put it in the center
   // by scrolling and zooming. We handle zooming with a meta tag. We used to handle scrolling
   // using a complicated JS hack.
diff --git a/app/assets/stylesheets/common/components/footer-nav.scss b/app/assets/stylesheets/common/components/footer-nav.scss
index 03915731f99..07d2e40b07e 100644
--- a/app/assets/stylesheets/common/components/footer-nav.scss
+++ b/app/assets/stylesheets/common/components/footer-nav.scss
@@ -13,12 +13,6 @@ html.footer-nav-visible {
     padding-bottom: calc(var(--footer-nav-height) + 15px);
   }
 
-  #reply-control.draft {
-    bottom: var(--footer-nav-height);
-    margin-bottom: env(safe-area-inset-bottom);
-    padding-bottom: 0;
-  }
-
   .with-topic-progress {
     bottom: calc(
       var(--footer-nav-height) + env(safe-area-inset-bottom) +