diff --git a/Tusker/Screens/Main/MainSplitViewController.swift b/Tusker/Screens/Main/MainSplitViewController.swift
index c11b65d4..3bdd94e1 100644
--- a/Tusker/Screens/Main/MainSplitViewController.swift
+++ b/Tusker/Screens/Main/MainSplitViewController.swift
@@ -315,10 +315,15 @@ extension MainSplitViewController: TuskerRootViewController {
     }
     
     func select(tab: MainTabBarViewController.Tab) {
-        if tab == .compose {
-            presentCompose()
+        if traitCollection.horizontalSizeClass == .compact {
+            tabBarViewController?.select(tab: tab)
         } else {
-            select(item: .tab(tab))
+            if tab == .compose {
+                presentCompose()
+            } else {
+                select(item: .tab(tab))
+                sidebar.select(item: .tab(tab), animated: false)
+            }
         }
     }
 }
diff --git a/Tusker/Shortcuts/AppShortcutItems.swift b/Tusker/Shortcuts/AppShortcutItems.swift
index d0efdffa..334c02eb 100644
--- a/Tusker/Shortcuts/AppShortcutItems.swift
+++ b/Tusker/Shortcuts/AppShortcutItems.swift
@@ -47,8 +47,9 @@ enum AppShortcutItem: String, CaseIterable {
         }
         let scene = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }.first!
         let window = scene.windows.first { $0.isKeyWindow }!
-        let controller = window.rootViewController as! MainTabBarViewController
-        controller.select(tab: tab)
+        if let controller = window.rootViewController as? TuskerRootViewController {
+            controller.select(tab: tab)
+        }
     }
 }