diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index be4cdf5b..5759c87e 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -264,8 +264,11 @@ namespace SourceGit.Views
             }
             else if (e.Key == Key.Escape)
             {
-                vm.ActivePage.CancelPopup();
-                vm.CancelSwitcher();
+                if (vm.Switcher != null)
+                    vm.CancelSwitcher();
+                else
+                    vm.ActivePage.CancelPopup();
+
                 e.Handled = true;
                 return;
             }