diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
index 6132b66..f1215fb 100644
--- a/app/DD_PM_WINDREAM/ClassControlCreator.vb
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -492,10 +492,10 @@ Public Class ClassControlCreator
 
                                                         If GridTables.ContainsKey(e.Column.FieldName) Then
                                                             Dim oComboboxDataTable As DataTable = GridTables.Item(e.Column.FieldName)
-                                                            Dim oEditor As New RepositoryItemComboBox()
+                                                            'Dim oEditor As New RepositoryItemComboBox()
+                                                            Dim oEditor As New RepositoryItemLookUpEdit()
                                                             Dim oItems As New List(Of String)
 
-                                                            oEditor.AutoComplete = True
                                                             AddHandler oEditor.Validating, Sub(_sender As ComboBoxEdit, _e As CancelEventArgs)
                                                                                                If oItems.Contains(_sender.EditValue) Then
                                                                                                    _e.Cancel = False
@@ -505,12 +505,7 @@ Public Class ClassControlCreator
 
                                                                                            End Sub
 
-                                                            For Each oRow2 In oComboboxDataTable.Rows
-                                                                Dim oValue = oRow2.item(0)
-                                                                oEditor.Items.Add(oValue)
-                                                                oItems.Add(oValue)
-                                                            Next
-
+                                                            oEditor.DataSource = oComboboxDataTable
                                                             e.RepositoryItem = oEditor
                                                         End If
                                                     End If