diff --git a/Tusker/Screens/Main/MainSplitViewController.swift b/Tusker/Screens/Main/MainSplitViewController.swift
index a04d74f60f..49f7cd698a 100644
--- a/Tusker/Screens/Main/MainSplitViewController.swift
+++ b/Tusker/Screens/Main/MainSplitViewController.swift
@@ -164,7 +164,10 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
         }
         
         // Switch the tab bar to focus the same item as the sidebar has selected
-        switch sidebar.selectedItem! {
+        switch sidebar.selectedItem {
+        case nil:
+            break
+            
         case let .tab(tab):
             // sidebar items that map 1 <-> 1 can be transferred directly
             tabBarViewController.select(tab: tab)