diff --git a/Sources/PulseUI/Features/Main/MainView-ios-tvos.swift b/Sources/PulseUI/Features/Main/MainView-ios-tvos.swift
index d3cf3c8aa..dd07cfbef 100644
--- a/Sources/PulseUI/Features/Main/MainView-ios-tvos.swift
+++ b/Sources/PulseUI/Features/Main/MainView-ios-tvos.swift
@@ -23,11 +23,13 @@ public struct MainView: View {
     public var body: some View {
         TabView {
             ForEach(viewModel.items) { item in
-                viewModel.makeView(for: item)
-                    .tabItem {
-                        Image(systemName: item.imageName)
-                        Text(item.title)
-                    }
+                NavigationView {
+                    viewModel.makeView(for: item)
+                        .tabItem {
+                            Image(systemName: item.imageName)
+                            Text(item.title)
+                        }
+                }
             }
         }
     }
diff --git a/Sources/PulseUI/Features/Main/MainViewModel.swift b/Sources/PulseUI/Features/Main/MainViewModel.swift
index ebc42781b..a0a225a69 100644
--- a/Sources/PulseUI/Features/Main/MainViewModel.swift
+++ b/Sources/PulseUI/Features/Main/MainViewModel.swift
@@ -78,24 +78,16 @@ extension MainViewModel {
     func makeView(for item: MainViewModelItem) -> some View {
         switch item {
         case .console:
-            NavigationView {
-                ConsoleView(viewModel: consoleModel)
-            }
+            ConsoleView(viewModel: consoleModel)
         case .network:
-            NavigationView {
-                NetworkView(viewModel: networkModel)
-            }
+            NetworkView(viewModel: networkModel)
         #if !os(tvOS)
         case .pins:
-            NavigationView {
-                PinsView(viewModel: pinsModel)
-            }
+            PinsView(viewModel: pinsModel)
         #endif
         #if os(iOS) || os(tvOS)
         case .settings:
-            NavigationView {
-                SettingsView(viewModel: settingsModel, console: consoleModel)
-            }
+            SettingsView(viewModel: settingsModel, console: consoleModel)
         #endif
         default: fatalError()
         }
diff --git a/Sources/PulseUI/UIKItSupport/MainViewController.swift b/Sources/PulseUI/UIKItSupport/MainViewController.swift
index 47b3a3145..b2f967ed5 100644
--- a/Sources/PulseUI/UIKItSupport/MainViewController.swift
+++ b/Sources/PulseUI/UIKItSupport/MainViewController.swift
@@ -48,7 +48,7 @@ public final class MainViewController: UITabBarController {
         }
         viewControllers = model.items.enumerated().map {
             let item = $0.element
-            let vc = UIHostingController(rootView: model.makeView(for: item))
+            let vc = UINavigationController(rootViewController: UIHostingController(rootView: model.makeView(for: item)))
             vc.tabBarItem = UITabBarItem(title: item.title, image: UIImage(systemName: item.imageName), tag: $0.offset)
             return vc
         }