diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index f0c8f8fdb67..ffeaebadd4f 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -347,11 +347,19 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
           height = winHeight - menuTop;
         }
 
+        const isIPadApp = document.body.classList.contains("footer-nav-ipad"),
+          heightProp = isIPadApp ? "max-height" : "height",
+          iPadOffset = 10;
+
+        if (isIPadApp) {
+          height = winHeight - menuTop - iPadOffset;
+        }
+
         if ($panelBody.prop("style").height !== "100%") {
           $panelBody.height("100%");
         }
-        if (style.top !== menuTop + "px" || style.height !== height) {
-          $panel.css({ top: menuTop + "px", height });
+        if (style.top !== menuTop + "px" || style[heightProp] !== height) {
+          $panel.css({ top: menuTop + "px", [heightProp]: height });
           $(".header-cloak").css({ top: menuTop + "px" });
         }
         $("body").removeClass("drop-down-mode");
diff --git a/app/assets/javascripts/discourse/app/lib/offset-calculator.js b/app/assets/javascripts/discourse/app/lib/offset-calculator.js
index efa258fc70c..c9cffee5cfd 100644
--- a/app/assets/javascripts/discourse/app/lib/offset-calculator.js
+++ b/app/assets/javascripts/discourse/app/lib/offset-calculator.js
@@ -3,8 +3,11 @@ export function scrollTopFor(y) {
 }
 
 export function minimumOffset() {
-  const header = document.querySelector("header.d-header");
-  return header ? header.offsetHeight : 0;
+  const header = document.querySelector("header.d-header"),
+    iPadNav = document.querySelector(".footer-nav-ipad .footer-nav"),
+    iPadNavHeight = iPadNav ? iPadNav.offsetHeight : 0;
+
+  return header ? header.offsetHeight + iPadNavHeight : 0;
 }
 
 export default function offsetCalculator() {
diff --git a/app/assets/stylesheets/common/components/footer-nav.scss b/app/assets/stylesheets/common/components/footer-nav.scss
index a40bf872121..f116d02afe8 100644
--- a/app/assets/stylesheets/common/components/footer-nav.scss
+++ b/app/assets/stylesheets/common/components/footer-nav.scss
@@ -86,18 +86,4 @@ body.footer-nav-ipad {
   &.docked .d-header-wrap {
     top: $footer-nav-height;
   }
-
-  @media only screen and (orientation: landscape) {
-    $status-bar-padding: 12px;
-
-    padding-top: $footer-nav-height + $status-bar-padding;
-
-    .footer-nav {
-      padding-top: $status-bar-padding;
-    }
-
-    &.docked .d-header-wrap {
-      top: $footer-nav-height + $status-bar-padding;
-    }
-  }
 }