diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 228dbdcb..9c2eebf9 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -355,6 +355,9 @@ import UIKit
     
     open func pageShown() {
         // Update the navigation bar ui when view is appearing.
+        if self == MVMCoreUISplitViewController.main()?.getCurrentDetailViewController() {
+            MVMCoreUISplitViewController.main()?.setupPanels()
+        }
         setNavigationBar()
         
         // Update tab if needed.
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
index 963834ff..ea1a18e9 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
@@ -23,10 +23,6 @@ public extension MVMCoreUISplitViewController {
         
     /// Sets the navigation item for the view controller based on the model and splitview controller
     func set(for viewController: UIViewController, navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, leftPanelAccessible: Bool? = nil, rightPanelAccessible: Bool? = nil, progress: Float? = nil) {
-        
-        // Setup the panels.
-        setupPanels()
-
         NavigationController.setNavigationBarUI(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
         
         setLeftPanelIsAccessible(leftPanelAccessible ?? leftPanelIsAccessible, for: viewController, updateNavigationButtons: false)