diff --git a/Terminal.Gui/Views/ComboBox.cs b/Terminal.Gui/Views/ComboBox.cs
index 5a6b6e243..9923c657a 100644
--- a/Terminal.Gui/Views/ComboBox.cs
+++ b/Terminal.Gui/Views/ComboBox.cs
@@ -49,7 +49,8 @@ namespace Terminal.Gui {
 			if (source == null) {
 				Source = null;
 			} else {
-				Source = MakeWrapper (source);
+				listview.SetSource (source);
+				Source = listview.Source;
 			}
 		}
 
@@ -106,11 +107,6 @@ namespace Terminal.Gui {
 			SetSource (source);
 		}
 
-		static IListDataSource MakeWrapper (IList source)
-		{
-			return new ListWrapper (source);
-		}
-
 		private void Initialize ()
 		{
 			ColorScheme = Colors.Base;