diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FormControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FormControl.xaml
index 8456c1c747..35a680dea2 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FormControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FormControl.xaml
@@ -25,7 +25,6 @@
         x:Name="ContentGrid"
         Padding="12, 8, 8, 8" 
         CornerRadius="{StaticResource OverlayCornerRadius}"
-        TabFocusNavigation="Cycle"
         Margin="0,4,4,4"
         Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
         BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/FormsPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/FormsPage.xaml
index 1add136502..09937e8162 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/FormsPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/FormsPage.xaml
@@ -23,15 +23,16 @@
 
         <controls:SwitchPresenter TargetType="local:ViewModelLoadedState" Value="{x:Bind LoadedState, Mode=OneWay}">
             <controls:Case Value="Loaded">
-
-                <ItemsControl Margin="8" ItemsSource="{x:Bind ViewModel.Forms, Mode=OneWay}">
-                    <!-- or ListView or ItemsRepeater more likely... -->
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate x:DataType="viewmodels:FormViewModel">
-                            <cmdPalControls:FormControl ViewModel="{x:Bind}"/>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
+                <ScrollView VerticalAlignment="Top" VerticalScrollMode="Enabled">
+                    <ItemsControl  VerticalAlignment="Stretch" Margin="8" ItemsSource="{x:Bind ViewModel.Forms, Mode=OneWay}">
+                        <!-- or ListView or ItemsRepeater more likely... -->
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate x:DataType="viewmodels:FormViewModel">
+                                <cmdPalControls:FormControl ViewModel="{x:Bind}"/>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollView>
 
             </controls:Case>