diff --git a/lcl/include/dbcombobox.inc b/lcl/include/dbcombobox.inc
index 26e405c8f9..36d76bbc5e 100644
--- a/lcl/include/dbcombobox.inc
+++ b/lcl/include/dbcombobox.inc
@@ -61,8 +61,19 @@ procedure TDBComboBox.Select;
 begin
   //avoid reseting text when calling select
   FDataLink.OnDataChange := nil;
-  FDataLink.Edit;
-  FDataLink.Modified;
-  FDataLink.OnDataChange := @DataChange;
-  inherited Select;
+  try
+    if FDataLink.Edit then
+    begin
+       FDataLink.Modified;
+       inherited Select;
+    end
+    else
+    begin
+       // if cannot modify, let it reset
+       FDatalink.Reset;
+       DataChange(Self);
+    end;
+  finally
+    FDataLink.OnDataChange := @DataChange;
+  end;
 end;