diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb
index 9fc080f0..b53b5278 100644
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -13,13 +13,6 @@ Imports DevExpress.XtraEditors.Controls
 Public Class LookupControl3
     Inherits GridLookUpEdit
 
-    Shared Sub New()
-        RepositoryItemLookupControl3.RegisterLookupControl()
-    End Sub
-
-    Public Sub New()
-    End Sub
-
     <DesignerSerializationVisibility(DesignerSerializationVisibility.Content)>
     Public Shadows ReadOnly Property Properties As RepositoryItemLookupControl3
         Get
@@ -32,6 +25,13 @@ Public Class LookupControl3
             Return RepositoryItemLookupControl3.CustomEditName
         End Get
     End Property
+
+    Shared Sub New()
+        RepositoryItemLookupControl3.RegisterLookupControl()
+    End Sub
+
+    Public Sub New()
+    End Sub
 End Class
 
 <UserRepositoryItem("RegisterLookupControl3")>
@@ -42,6 +42,10 @@ Public Class RepositoryItemLookupControl3
         RegisterLookupControl()
     End Sub
 
+    Public Sub New()
+        SetDropdownButtonEnabled(_MultiSelect)
+    End Sub
+
     Private Const TAG_DROPDOWN = "openDropdown"
 
     Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm"
@@ -96,8 +100,8 @@ Public Class RepositoryItemLookupControl3
     End Property
 
     Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs)
-        If MultiSelect = True Then
-            MyBase.RaiseQueryPopUp(e)
+        If MultiSelect = False Then
+            e.Cancel = True
         End If
     End Sub
 
@@ -227,4 +231,10 @@ Public Class RepositoryItemLookupControl3
             EndUpdate()
         End Try
     End Sub
+
+    Public Sub HandleQueryPopup(sender As Object, e As CancelEventArgs) Handles Me.QueryPopUp
+        If MultiSelect = False Then
+            e.Cancel = True
+        End If
+    End Sub
 End Class
diff --git a/GUIs.Test.TestGUI/frmLookup.vb b/GUIs.Test.TestGUI/frmLookup.vb
index 7a4b3736..1f245a2e 100644
--- a/GUIs.Test.TestGUI/frmLookup.vb
+++ b/GUIs.Test.TestGUI/frmLookup.vb
@@ -8,8 +8,10 @@ Public Class frmLookup
             _Datasource.Add($"item-{index}")
         Next
 
-
-        LookupControl31.Properties.DataSource = GetDatatable(10)
+        Dim oTable = GetDatatable(10)
+        LookupControl31.Properties.DataSource = oTable
+        LookupControl31.Properties.ValueMember = oTable.Columns.Item(0).ColumnName
+        LookupControl31.Properties.DisplayMember = oTable.Columns.Item(0).ColumnName
 
         Dim oEditor As New LookupControl3
         GridControl1.DataSource = New List(Of String) From {"foo", "var"}