diff --git a/Seyounth.Hyosung.UI/Views/Pages/DashboardPage.xaml b/Seyounth.Hyosung.UI/Views/Pages/DashboardPage.xaml
index 20a6017..be482f0 100644
--- a/Seyounth.Hyosung.UI/Views/Pages/DashboardPage.xaml
+++ b/Seyounth.Hyosung.UI/Views/Pages/DashboardPage.xaml
@@ -54,6 +54,9 @@
                 </Border>
                 <ui:CardControl CornerRadius="0,0,0,0" Header="产品ID">
                     <ComboBox Margin="0,0,10,0" Width="400"
+                              VirtualizingPanel.IsVirtualizing="True"
+                              VirtualizingPanel.VirtualizationMode="Recycling"
+                              ScrollViewer.CanContentScroll="True"
                               ItemsSource="{Binding ViewModel.Varieties}"
                               SelectedItem="{Binding ViewModel.SelectedVariety, Mode=TwoWay}"
                               DisplayMemberPath="Name" />
diff --git a/Seyounth.Hyosung.UI/Views/Pages/DataPage.xaml b/Seyounth.Hyosung.UI/Views/Pages/DataPage.xaml
index d4b9f3b..48b86d5 100644
--- a/Seyounth.Hyosung.UI/Views/Pages/DataPage.xaml
+++ b/Seyounth.Hyosung.UI/Views/Pages/DataPage.xaml
@@ -37,6 +37,10 @@
                      HeadersVisibility="All"
                      VerticalContentAlignment="Center"
                      CanUserAddRows="False"
+                     EnableRowVirtualization="True"
+                     EnableColumnVirtualization="True"
+                     VirtualizingPanel.VirtualizationMode="Recycling"
+                     ScrollViewer.CanContentScroll="True"
                      AddingNewItem="VarietyDataGrid_AddingNewItem"
                      CellEditEnding="VarietyDataGrid_CellEditEnding"
                      ItemsSource="{Binding ViewModel.Varieties, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"