diff --git a/AltStore/App Detail/AppViewController.swift b/AltStore/App Detail/AppViewController.swift
index 62cb7b8e..67aa547d 100644
--- a/AltStore/App Detail/AppViewController.swift	
+++ b/AltStore/App Detail/AppViewController.swift	
@@ -191,7 +191,21 @@ final class AppViewController: UIViewController
             self._shouldResetLayout = false
         }
                 
-        let statusBarHeight = self.view.window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
+        let statusBarHeight: Double
+        
+        if let navigationController, navigationController.presentingViewController != nil, navigationController.modalPresentationStyle != .fullScreen
+        {
+            statusBarHeight = 20
+        }
+        else if let statusBarManager = self.view.window?.windowScene?.statusBarManager
+        {
+            statusBarHeight = statusBarManager.statusBarFrame.height
+        }
+        else
+        {
+            statusBarHeight = 0
+        }
+        
         let cornerRadius = self.contentViewControllerShadowView.layer.cornerRadius
         
         let inset = 12 as CGFloat
diff --git a/AltStore/Components/HeaderContentViewController.swift b/AltStore/Components/HeaderContentViewController.swift
index 8b3ffe5f..ce03e2bd 100644
--- a/AltStore/Components/HeaderContentViewController.swift
+++ b/AltStore/Components/HeaderContentViewController.swift
@@ -277,8 +277,21 @@ class HeaderContentViewController<Header: UIView, Content: ScrollableContentView
             self._shouldResetLayout = false
         }
         
-        //TODO: Dynamically calculate status bar height.
-        let statusBarHeight = 20.0 //self.view.window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
+        let statusBarHeight: Double
+        
+        if let navigationController, navigationController.presentingViewController != nil, navigationController.modalPresentationStyle != .fullScreen
+        {
+            statusBarHeight = 20
+        }
+        else if let statusBarManager = self.view.window?.windowScene?.statusBarManager
+        {
+            statusBarHeight = statusBarManager.statusBarFrame.height
+        }
+        else
+        {
+            statusBarHeight = 0
+        }
+        
         let cornerRadius = self.contentViewControllerShadowView.layer.cornerRadius
         
         let inset = 15 as CGFloat