             make.edges.equalTo(self.view)
         }
 
-        if let tab = tabManager.selectedTab where tab.isPrivate {
-            privateMode = true
-        } else if PrivateBrowsing.singleton.isOn {
-            privateMode = true
-        }
+        // Make sure buttons are all setup before this, to allow
+        // privateMode setter to setup final visuals
+        let selectedTabIsPrivate = tabManager.selectedTab?.isPrivate ?? false
+        privateMode = PrivateBrowsing.singleton.isOn || selectedTabIsPrivate
 
         NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(TabTrayController.SELappWillResignActiveNotification), name: UIApplicationWillResignActiveNotification, object: nil)
         NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(TabTrayController.SELappDidBecomeActiveNotification), name: UIApplicationDidBecomeActiveNotification, object: nil)

        privateMode = !privateMode
        if privateMode {
            PrivateBrowsing.singleton.enter()
            togglePrivateMode.backgroundColor = UIColor.whiteColor()
            togglePrivateMode.layer.cornerRadius = 4.0
        } else {
            self.togglePrivateMode.backgroundColor = UIColor.clearColor()
            view.userInteractionEnabled = false
            view.alpha = 0.5
            let activityView = UIActivityIndicatorView(activityIndicatorStyle: .WhiteLarge)

    lazy var togglePrivateMode: UIButton = {
        let button = UIButton()
        button.setTitle(Strings.Private, forState: .Normal)
        button.setTitleColor(UIColor.blackColor(), forState: .Normal)
        button.titleLabel!.font = UIFont.systemFontOfSize(button.titleLabel!.font.pointSize + 2)
        button.contentEdgeInsets = UIEdgeInsetsMake(0, 4 /* left */, 0, 4 /* right */)
        button.layer.cornerRadius = 4.0
        button.addTarget(self, action: #selector(TabTrayController.SELdidTogglePrivateMode), forControlEvents: .TouchUpInside)
        button.accessibilityLabel = PrivateModeStrings.toggleAccessibilityLabel
        button.accessibilityHint = PrivateModeStrings.toggleAccessibilityHint
        button.accessibilityIdentifier = "TabTrayController.togglePrivateMode"

        return button
    }()

