diff --git a/Delta/Components/Popover Menu/ListMenuViewController.swift b/Delta/Components/Popover Menu/ListMenuViewController.swift
index 6129d47..4337d51 100644
--- a/Delta/Components/Popover Menu/ListMenuViewController.swift	
+++ b/Delta/Components/Popover Menu/ListMenuViewController.swift	
@@ -21,7 +21,8 @@ class ListMenuViewController: UITableViewController
     
     override var preferredContentSize: CGSize {
         get {
-            let navigationBarHeight = self.navigationController?.navigationBar.bounds.height ?? 0.0
+            // Don't include navigation bar height in calculation (as of iOS 13).
+            let navigationBarHeight = 0.0 // self.navigationController?.navigationBar.bounds.height ?? 0.0
             return CGSize(width: 0, height: (self.tableView.rowHeight * CGFloat(self.items.count)) + navigationBarHeight)
         }
         set {}
diff --git a/Delta/Settings/Controllers/ControllerInputsViewController.swift b/Delta/Settings/Controllers/ControllerInputsViewController.swift
index 2051891..964c034 100644
--- a/Delta/Settings/Controllers/ControllerInputsViewController.swift
+++ b/Delta/Settings/Controllers/ControllerInputsViewController.swift
@@ -210,6 +210,10 @@ private extension ControllerInputsViewController
         listMenuViewController.title = NSLocalizedString("Game System", comment: "")
         
         let navigationController = UINavigationController(rootViewController: listMenuViewController)
+        if #available(iOS 13, *)
+        {
+            navigationController.navigationBar.scrollEdgeAppearance = navigationController.navigationBar.standardAppearance
+        }
         
         let popoverMenuController = PopoverMenuController(popoverViewController: navigationController)
         self.navigationItem.popoverMenuController = popoverMenuController