diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb
index bea6278d..1bc07807 100644
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -30,36 +30,8 @@ Public Class LookupControl3
         RepositoryItemLookupControl3.RegisterLookupControl()
     End Sub
 
-    Friend WithEvents fProperties As RepositoryItemGridLookUpEdit
-    Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
-
     Public Sub New()
     End Sub
-
-    Private Sub InitializeComponent()
-        Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit()
-        Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView()
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'fProperties
-        '
-        Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.fProperties.Name = "fProperties"
-        Me.fProperties.PopupView = Me.fPropertiesView
-        '
-        'fPropertiesView
-        '
-        Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
-        Me.fPropertiesView.Name = "fPropertiesView"
-        Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.fPropertiesView.OptionsView.ShowGroupPanel = False
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-
-    End Sub
 End Class
 
 <UserRepositoryItem("RegisterLookupControl3")>
@@ -202,7 +174,11 @@ Public Class RepositoryItemLookupControl3
     End Sub
 
     Public Overrides Sub CreateDefaultButton()
-        MyBase.CreateDefaultButton()
+        If MultiSelect Then
+            MyBase.CreateDefaultButton()
+            Buttons.Item(0).Tag = TAG_DROPDOWN
+            ActionButtonIndex = 0
+        End If
 
         Dim oLookupFormButtonm = New EditorButton() With {
             .Kind = ButtonPredefines.Search,
@@ -210,10 +186,7 @@ Public Class RepositoryItemLookupControl3
             .Width = 20
         }
 
-        Buttons.Item(0).Tag = TAG_DROPDOWN
         Buttons.AddRange({oLookupFormButtonm})
-
-        ActionButtonIndex = 0
     End Sub
 
     Private Function GetLookupForm() As frmLookupGrid
diff --git a/Controls.LookupGrid/Resources/Strings.Designer.vb b/Controls.LookupGrid/Resources/Strings.Designer.vb
index 136f8d4b..a88c816a 100644
--- a/Controls.LookupGrid/Resources/Strings.Designer.vb
+++ b/Controls.LookupGrid/Resources/Strings.Designer.vb
@@ -83,7 +83,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Ein Datensatz ausgewählt ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 1 Datensatz ausgewählt ähnelt.
         '''</summary>
         Friend Shared ReadOnly Property LookupControl_OneRecord() As String
             Get
diff --git a/Controls.LookupGrid/Resources/Strings.en.resx b/Controls.LookupGrid/Resources/Strings.en.resx
index f9bd92ec..653a4c64 100644
--- a/Controls.LookupGrid/Resources/Strings.en.resx
+++ b/Controls.LookupGrid/Resources/Strings.en.resx
@@ -124,7 +124,7 @@
     <value>{0} records selected</value>
   </data>
   <data name="LookupControl_OneRecord" xml:space="preserve">
-    <value>One record selected</value>
+    <value>1 record selected</value>
   </data>
   <data name="PopupForm_Text" xml:space="preserve">
     <value>Please choose a value:</value>
diff --git a/Controls.LookupGrid/Resources/Strings.resx b/Controls.LookupGrid/Resources/Strings.resx
index dd5e4f94..093ffed5 100644
--- a/Controls.LookupGrid/Resources/Strings.resx
+++ b/Controls.LookupGrid/Resources/Strings.resx
@@ -124,7 +124,7 @@
     <value>{0} Datensätze ausgewählt</value>
   </data>
   <data name="LookupControl_OneRecord" xml:space="preserve">
-    <value>Ein Datensatz ausgewählt</value>
+    <value>1 Datensatz ausgewählt</value>
   </data>
   <data name="PopupForm_Text" xml:space="preserve">
     <value>Bitte wählen Sie einen Wert aus:</value>
diff --git a/Controls.LookupGrid/frmLookupGrid.resx b/Controls.LookupGrid/frmLookupGrid.resx
index 4bef9e4c..13d7fb82 100644
--- a/Controls.LookupGrid/frmLookupGrid.resx
+++ b/Controls.LookupGrid/frmLookupGrid.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
-  </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>OK (F2)</value>
   </data>
@@ -158,6 +155,9 @@
   <data name="&gt;&gt;btnClear.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;btnClear.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmLookupGrid</value>
   </data>
@@ -177,6 +177,10 @@
   <data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
+    <value>None</value>
+  </data>
   <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
     <value>Center</value>
@@ -214,6 +218,9 @@
   <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
     <value>136, 23</value>
   </data>
+  <data name="&gt;&gt;viewLookup.Name" xml:space="preserve">
+    <value>viewLookup</value>
+  </data>
   <data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
     <value>Tile</value>
   </data>
@@ -229,9 +236,6 @@
   <data name="$this.TextMultiLine" xml:space="preserve">
     <value>Wählen Sie einen oder mehrere Werte:</value>
   </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>Panel1</value>
-  </data>
   <data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>Inherit</value>
   </data>
@@ -251,15 +255,11 @@
   <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 221</value>
   </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="&gt;&gt;btnClear.Parent" xml:space="preserve">
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
     <value>Panel1</value>
   </data>
-  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
-    <value>None</value>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
   </data>
   <data name="&gt;&gt;Panel1.Type" xml:space="preserve">
     <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -273,8 +273,8 @@
   <data name="gridLookup.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
   </data>
-  <data name="&gt;&gt;viewLookup.Name" xml:space="preserve">
-    <value>viewLookup</value>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
   </data>
   <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 6</value>