diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 228dbdcb..c46ef48f 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -243,7 +243,7 @@ import UIKit
         }
         
         // Utilize helper function to set the split view and navigation item state.
-        MVMCoreUISplitViewController.setSplitViewController(for: viewController, navigationController: navigationController, navigationItemModel: navigationItemModel, leftPanelAccessible: isMasterInitiallyAccessible(), rightPanelAccessible: isSupportInitiallyAccessible(), progress: bottomProgress() ?? 0)
+        MVMCoreUISplitViewController.setNavigationBarUI(for: viewController, navigationController: navigationController, navigationItemModel: navigationItemModel, leftPanelAccessible: isMasterInitiallyAccessible(), rightPanelAccessible: isSupportInitiallyAccessible(), progress: bottomProgress() ?? 0)
     }
     
     // Eventually will be moved to server
@@ -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..24a8d9f7 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
@@ -11,7 +11,7 @@ import Foundation
 public extension MVMCoreUISplitViewController {
     
     /// Convenience function. Sets the navigation and split view properties for the view controller. Optional parameters use current value if not set.
-    static func setSplitViewController(for viewController: UIViewController, navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, leftPanelAccessible: Bool? = nil, rightPanelAccessible: Bool? = nil, progress: Float? = nil) {
+    static func setNavigationBarUI(for viewController: UIViewController, navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, leftPanelAccessible: Bool? = nil, rightPanelAccessible: Bool? = nil, progress: Float? = nil) {
         guard let splitView = MVMCoreUISplitViewController.main(),
             navigationController == splitView.navigationController,
             navigationController.topViewController == viewController else {
@@ -22,11 +22,7 @@ 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()
-
+    private func set(for viewController: UIViewController, navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, leftPanelAccessible: Bool? = nil, rightPanelAccessible: Bool? = nil, progress: Float? = nil) {
         NavigationController.setNavigationBarUI(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
         
         setLeftPanelIsAccessible(leftPanelAccessible ?? leftPanelIsAccessible, for: viewController, updateNavigationButtons: false)
@@ -110,7 +106,7 @@ public extension MVMCoreUISplitViewController {
     
     // MARK: - Legacy Functions
     /// Convenience setter for legacy files. Sets the navigation item for the view controller based on the json and splitview controller
-    @objc static func setSplitViewController(for viewController: UIViewController, navigationController: UINavigationController, navigationJSON: [String: Any], leftPanelAccessible: Bool, rightPanelAccessible: Bool, progress: NSNumber?) throws {
+    @objc static func setNavigationBarUI(for viewController: UIViewController, navigationController: UINavigationController, navigationJSON: [String: Any], leftPanelAccessible: Bool, rightPanelAccessible: Bool, progress: NSNumber?) throws {
         guard let navigationItemModel = try MoleculeObjectMapping.shared()?.getMoleculeModelForJSON(navigationJSON) as? (MoleculeModelProtocol & NavigationItemModelProtocol) else {
             throw ModelRegistry.Error.decoderOther(message: "Model not a bar model")
         }