foo.diff

diff --git a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift
index 1ea4a35..03ec48c 100644
--- a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift
+++ b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift
@@ -98,6 +98,14 @@ class WPSplitViewController: UISplitViewController {
         return UITraitCollection(traitsFromCollections: [collection, overrideCollection])
     }
 
+    override func viewWillAppear(animated: Bool) {
+        super.viewWillAppear(animated)
+
+        if viewControllers.count == 1 {
+            updateInitialViewControllers()
+        }
+    }
+
     override func viewWillTransitionToSize(size: CGSize, withTransitionCoordinator coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)
 
@@ -222,18 +230,17 @@ class WPSplitViewController: UISplitViewController {
      *  detail view controller.
      */
     func setInitialPrimaryViewController(viewController: UIViewController) {
-        var initialViewControllers = [viewController]
+        viewControllers = [viewController]
+    }
 
-        if let navigationController = viewController as? UINavigationController,
+    func updateInitialViewControllers() {
+        if let navigationController = viewControllers.first as? UINavigationController,
             let rootViewController = navigationController.viewControllers.last,
             let detailViewController = initialDetailViewControllerForPrimaryViewController(rootViewController) {
 
             navigationController.delegate = self
 
-            initialViewControllers.append(detailViewController)
-            viewControllers = initialViewControllers
-        } else {
-            viewControllers = [viewController, UIViewController()]
+            viewControllers = [navigationController, detailViewController]
         }
     }