diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp
index 62e8a1ad22..c14aa6fa94 100644
--- a/lcl/dbctrls.pp
+++ b/lcl/dbctrls.pp
@@ -862,6 +862,7 @@ Type
   protected
     procedure DefineProperties(Filer: TFiler); override;
     function DoEdit: boolean; override;
+    procedure DoAutoCompleteSelect; override;
     function IsUnbound: boolean;
   private
     FLookup: TDBLookup;
diff --git a/lcl/include/customcombobox.inc b/lcl/include/customcombobox.inc
index 16a2b5393a..02f4fdf92d 100644
--- a/lcl/include/customcombobox.inc
+++ b/lcl/include/customcombobox.inc
@@ -144,6 +144,12 @@ begin
   inherited DoExit;
 end;
 
+// this is a select triggered by autocomplete
+procedure TCustomComboBox.DoAutoCompleteSelect;
+begin
+  Select;
+end;
+
 {------------------------------------------------------------------------------
   Method: TCustomComboBox.SetSorted
   Params: val - true means "sort" the combo
@@ -636,7 +642,7 @@ begin
         Text := sResultText;
         SelStart := iSelStart;
         SelLength := UTF8Length(Text);
-        Select;
+        DoAutoCompleteSelect;
       end;
     end;
   end;
diff --git a/lcl/include/dblookupcombobox.inc b/lcl/include/dblookupcombobox.inc
index b019aa3c94..0f82b3a7a6 100644
--- a/lcl/include/dblookupcombobox.inc
+++ b/lcl/include/dblookupcombobox.inc
@@ -55,8 +55,10 @@ begin
   if IsUnbound then begin
     if FDetectedEvents and DBCBEVENT_CHANGE <> 0 then
       DoOnChange;
-    if DetectedEvents and DBCBEVENT_SELECT <>0 then
+    if DetectedEvents and DBCBEVENT_SELECT <>0 then begin
+      FLookup.UpdateData(ItemIndex);
       DoOnSelect;
+    end;
     if DetectedEvents and DBCBEVENT_CLOSEUP <>0 then
       DoOnCloseUp;
   end
@@ -64,6 +66,14 @@ begin
     Result := inherited DoEdit;
 end;
 
+procedure TDBLookupComboBox.DoAutoCompleteSelect;
+begin
+  if IsUnbound then
+    FLookup.UpdateData(ItemIndex)
+  else
+    UpdateData(Self);
+end;
+
 function TDBLookupComboBox.IsUnbound: boolean;
 begin
   result := (FDataLink.DataSource=nil) or (DataField='');
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index ec669c9b0b..196a18e199 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -345,6 +345,7 @@ type
     procedure CreateParams(var Params: TCreateParams); override;
     procedure InitializeWnd; override;
     procedure DestroyWnd; override;
+    procedure DoAutoCompleteSelect; virtual;
     procedure DoEnter; override;
     procedure DoExit; override;
     procedure DrawItem(Index: Integer; ARect: TRect;