diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb
index 2555aa2a..20ef0dd3 100644
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -213,21 +213,17 @@ Public Class RepositoryItemLookupControl3
         End Try
     End Sub
 
-    Public Overrides Sub EndInit()
-        MyBase.EndInit()
+    Public Overrides Sub CreateDefaultButton()
+        MyBase.CreateDefaultButton()
 
-        Dim oLookupFormButton = New EditorButton() With {
+        Dim oLookupFormButtonm = New EditorButton() With {
             .Kind = ButtonPredefines.Search,
             .Tag = TAG_BUTTON_LOOKUP_FORM,
             .Width = 20
         }
 
-        ' Add button if it does not already exists
-        If Buttons.Contains(oLookupFormButton) = False Then
-            Buttons.Insert(0, oLookupFormButton)
-            ' Set the button which opens the dropdown
-            ActionButtonIndex = 1
-        End If
+        Buttons.Item(0).Tag = TAG_DROPDOWN
+        Buttons.AddRange({oLookupFormButtonm})
     End Sub
 
     Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs)