From f6e6fe676a0923990b711a9ae15ec5eeff376dc2 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 9 Dec 2025 19:59:13 +0100
Subject: [PATCH] UX improvements

---
 .../QuickAccessXAML/MainWindow.xaml           | 11 +++--
 .../SettingsXAML/Views/GeneralPage.xaml       | 48 +++++++++----------
 .../Settings.UI/Strings/en-us/Resources.resw  |  9 ++--
 3 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml b/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml
index f39c64fc67..68a21ea494 100644
--- a/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml
+++ b/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml
@@ -7,16 +7,17 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:winuiEx="using:WinUIEx"
     Title="PowerToys Quick Access (Preview)"
-    Width="420"
-    Height="268"
-    MinWidth="420"
-    MinHeight="268"
+    Width="386"
+    Height="486"
+    MinWidth="386"
+    MinHeight="486"
     IsAlwaysOnTop="True"
     IsMaximizable="False"
     IsMinimizable="False"
     IsResizable="False"
+    IsShownInSwitchers="False"
+    IsTitleBarVisible="False"
     mc:Ignorable="d">
-
     <winuiEx:WindowEx.Backdrop>
         <winuiEx:AcrylicSystemBackdrop
             DarkFallbackColor="#1c1c1c"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index 8f8482660c..fea485e9b4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -273,32 +273,6 @@
                         </ComboBox>
                     </tkcontrols:SettingsCard>
 
-                    <tkcontrols:SettingsExpander
-                        Name="GeneralPageEnableQuickAccess"
-                        x:Uid="GeneralPage_EnableQuickAccess"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE71D;}"
-                        IsExpanded="True">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=GeneralPageEnableQuickAccess, Path=Header}"
-                            IsOn="{x:Bind ViewModel.EnableQuickAccess, Mode=TwoWay}" />
-                        <tkcontrols:SettingsExpander.Items>
-                            <!--  HACK: For some weird reason, a ShortcutControl does not work correctly if it's the first or last item in the expander, so we add an invisible card.  -->
-                            <tkcontrols:SettingsCard Visibility="Collapsed" />
-                            <tkcontrols:SettingsCard
-                                Name="QuickAccessShortcut"
-                                x:Uid="GeneralPage_QuickAccessShortcut"
-                                IsEnabled="{x:Bind ViewModel.EnableQuickAccess, Mode=OneWay}">
-                                <tkcontrols:SettingsCard.Description>
-                                    <TextBlock x:Uid="GeneralPage_QuickAccessShortcut_Description" />
-                                </tkcontrols:SettingsCard.Description>
-                                <controls:ShortcutControl
-                                    HotkeySettings="{x:Bind ViewModel.QuickAccessShortcut, Mode=TwoWay}" />
-                            </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Visibility="Collapsed" />
-                        </tkcontrols:SettingsExpander.Items>
-                    </tkcontrols:SettingsExpander>
-
                     <tkcontrols:SettingsCard
                         Name="GeneralPageRunAtStartUp"
                         x:Uid="GeneralPage_RunAtStartUp"
@@ -317,6 +291,28 @@
                                 Toggled="ShowSystemTrayIcon_Toggled" />
                         </tkcontrols:SettingsCard>
                     </controls:GPOInfoControl>
+
+                    <tkcontrols:SettingsExpander
+                        Name="GeneralPageEnableQuickAccess"
+                        x:Uid="GeneralPage_EnableQuickAccess"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE91C;}"
+                        IsExpanded="True">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=GeneralPageEnableQuickAccess, Path=Header}"
+                            IsOn="{x:Bind ViewModel.EnableQuickAccess, Mode=TwoWay}" />
+                        <tkcontrols:SettingsExpander.Items>
+                            <!--  HACK: For some weird reason, a ShortcutControl does not work correctly if it's the first or last item in the expander, so we add an invisible card.  -->
+                            <tkcontrols:SettingsCard Visibility="Collapsed" />
+                            <tkcontrols:SettingsCard
+                                Name="QuickAccessShortcut"
+                                x:Uid="GeneralPage_QuickAccessShortcut"
+                                IsEnabled="{x:Bind ViewModel.EnableQuickAccess, Mode=OneWay}">
+                                <controls:ShortcutControl HotkeySettings="{x:Bind ViewModel.QuickAccessShortcut, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Visibility="Collapsed" />
+                        </tkcontrols:SettingsExpander.Items>
+                    </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="General_SettingsBackupAndRestoreTitle" Visibility="Visible">
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 2f9876ac43..f327c2ff02 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -5764,16 +5764,13 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <comment>Fluent Design is a product name, do not loc</comment>
   </data>
   <data name="GeneralPage_EnableQuickAccess.Header" xml:space="preserve">
-    <value>Enable Quick Access flyout</value>
+    <value>Quick Access flyout</value>
   </data>
   <data name="GeneralPage_EnableQuickAccess.Description" xml:space="preserve">
-    <value>Keep the Quick Access process in memory for easy access to your favorite tools</value>
+    <value>Fast access to quick actions and module toggles</value>
   </data>
   <data name="GeneralPage_QuickAccessShortcut.Header" xml:space="preserve">
-    <value>Activation Shortcut</value>
-  </data>
-  <data name="GeneralPage_QuickAccessShortcut_Description.Text" xml:space="preserve">
-    <value>Change the activation shortcut for Quick Access</value>
+    <value>Activation shortcut</value>
   </data>
 </root>