From 4865b44de1ca3e47e4a75372652ab39564eefd7f Mon Sep 17 00:00:00 2001
From: "Shawn Yuan (from Dev Box)" <shuaiyuan@microsoft.com>
Date: Thu, 4 Dec 2025 15:47:54 +0800
Subject: [PATCH] fix scrolling issue

Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com>
---
 .../QuickAccessXAML/Flyout/AppsListPage.xaml      | 15 +++++++++------
 .../QuickAccessXAML/MainWindow.xaml               |  4 ++--
 .../ModuleList/ModuleList.xaml                    |  3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/AppsListPage.xaml b/src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/AppsListPage.xaml
index 4cb27db3e3..dedd69bc55 100644
--- a/src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/AppsListPage.xaml
+++ b/src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/AppsListPage.xaml
@@ -17,7 +17,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Padding="24,32,24,0">
+        <Grid Padding="24,12,24,0">
             <TextBlock
                 x:Uid="AllAppsTxt"
                 VerticalAlignment="Center"
@@ -37,7 +37,7 @@
                         <FontIcon FontSize="16" Glyph="&#xE8CB;" />
                     </Button.Content>
                     <Button.Flyout>
-                        <MenuFlyout>
+                        <MenuFlyout Placement="BottomEdgeAlignedRight">
                             <ToggleMenuFlyoutItem
                                 x:Uid="Dashboard_SortAlphabetical"
                                 Click="SortAlphabetical_Click"
@@ -69,9 +69,12 @@
                 </Button>
             </StackPanel>
         </Grid>
-        <controls:ModuleList
-            Grid.Row="1"
-            IsItemClickable="False"
-            ItemsSource="{x:Bind ViewModel.FlyoutMenuItems, Mode=OneWay}" />
+        <Grid Grid.Row="1">
+            <ScrollViewer
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <controls:ModuleList IsItemClickable="False" ItemsSource="{x:Bind ViewModel.FlyoutMenuItems, Mode=OneWay}" />
+            </ScrollViewer>
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml b/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml
index d0c8f3a12d..f39c64fc67 100644
--- a/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml
+++ b/src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml
@@ -8,9 +8,9 @@
     xmlns:winuiEx="using:WinUIEx"
     Title="PowerToys Quick Access (Preview)"
     Width="420"
-    Height="188"
+    Height="268"
     MinWidth="420"
-    MinHeight="188"
+    MinHeight="268"
     IsAlwaysOnTop="True"
     IsMaximizable="False"
     IsMinimizable="False"
diff --git a/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
index 9ba9e5a2a6..c8188a2e8e 100644
--- a/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
+++ b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.ModuleList"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -30,6 +30,7 @@
         Title="{x:Bind Title, Mode=OneWay}"
         MinWidth="400"
         Padding="0"
+        VerticalAlignment="Top"
         DividerVisibility="Collapsed">
         <controls:Card.TitleContent>
             <Button