From 7c2b186fda19b4897e246a2213714908d4f825a5 Mon Sep 17 00:00:00 2001
From: steven-norris <norris.stevenj@gmail.com>
Date: Fri, 1 May 2026 13:09:30 -0700
Subject: [PATCH 1/3] Update ComboBox.xaml

StackPanel to VirtualizingStackPanel to prevent long load times and UI lockups when the ComboBox binding contains sufficiently large list of items.
---
 src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
index d139f179b..ec60b33d8 100644
--- a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
+++ b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -175,9 +175,9 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="ItemsPanel">
             <Setter.Value>
-                <ItemsPanelTemplate>
-                    <StackPanel />
-                </ItemsPanelTemplate>
+              <ItemsPanelTemplate>
+                  <VirtualizingStackPanel />
+              </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="OverridesDefaultStyle" Value="True" />

From 299920a30ae569c72f28ef066d00cad8cd61fe99 Mon Sep 17 00:00:00 2001
From: steven-norris <norris.stevenj@gmail.com>
Date: Sat, 2 May 2026 19:12:48 -0800
Subject: [PATCH 2/3] Enable content scrolling and optimize item panel

---
 src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
index ec60b33d8..3ca0551cf 100644
--- a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
+++ b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -157,7 +157,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
@@ -175,9 +175,9 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="ItemsPanel">
             <Setter.Value>
-              <ItemsPanelTemplate>
-                  <VirtualizingStackPanel />
-              </ItemsPanelTemplate>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizingMode="Recycling" />
+                </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="OverridesDefaultStyle" Value="True" />

From e5c21b1bcaf654d7a4390cfda171fd9eb4a10387 Mon Sep 17 00:00:00 2001
From: steven-norris <norris.stevenj@gmail.com>
Date: Tue, 5 May 2026 12:13:40 -0700
Subject: [PATCH 3/3] Update ComboBox.xaml

I failed when I updated this code on my phone.
---
 src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
index 3ca0551cf..f117f5cd5 100644
--- a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
+++ b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -176,7 +176,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <VirtualizingStackPanel VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizingMode="Recycling" />
+                    <VirtualizingStackPanel VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling" />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>