diff --git a/src/Artemis.UI/DefaultTypes/DataModel/Input/EnumDataModelInputView.xaml b/src/Artemis.UI/DefaultTypes/DataModel/Input/EnumDataModelInputView.xaml
index 6fd659d69..340c9aa68 100644
--- a/src/Artemis.UI/DefaultTypes/DataModel/Input/EnumDataModelInputView.xaml
+++ b/src/Artemis.UI/DefaultTypes/DataModel/Input/EnumDataModelInputView.xaml
@@ -14,5 +14,11 @@
               SelectedValuePath="Value"
               DisplayMemberPath="Description"
               SelectedValue="{Binding Path=InputValue}" 
-              IsDropDownOpen="True"/>
+              IsDropDownOpen="True">
+        <ComboBox.ItemsPanel>
+            <ItemsPanelTemplate>
+                <VirtualizingStackPanel />
+            </ItemsPanelTemplate>
+        </ComboBox.ItemsPanel>
+    </ComboBox>
 </UserControl>
\ No newline at end of file