diff --git a/VERSION b/VERSION
index 52dc0d52..60bea9b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.17
\ No newline at end of file
+2025.18
\ No newline at end of file
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index bd115fef..88743c94 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -35,7 +35,7 @@
       <Button Grid.Column="0" Classes="icon_button" VerticalAlignment="Bottom" Margin="6,0,2,3" IsVisible="{OnPlatform True, macOS=False}">
         <Button.Flyout>
           <MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
-            <MenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" InputGesture="Ctrl+Shift+P">
+            <MenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" InputGesture="Ctrl+,">
               <MenuItem.Icon>
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
               </MenuItem.Icon>
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;
             }