diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/CollectionEditor.xaml.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/CollectionEditor.xaml.cs
index 954f3e7418..c6ab55c11d 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/CollectionEditor.xaml.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/CollectionEditor.xaml.cs
@@ -26,6 +26,9 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors
 			TypeMappings.Add(typeof(ListView),typeof(ListViewItem));
 			TypeMappings.Add(typeof(ComboBox),typeof(ComboBoxItem));
 			TypeMappings.Add(typeof(TreeView),typeof(TreeViewItem));
+			TypeMappings.Add(typeof(TabControl),typeof(TabItem));
+			TypeMappings.Add(typeof(ColumnDefinitionCollection),typeof(ColumnDefinition));
+			TypeMappings.Add(typeof(RowDefinitionCollection),typeof(RowDefinition));
 		}
 		
 		private DesignItem _item;