diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index 7f86c6cdb1..2f77ea5e4a 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -1300,10 +1300,8 @@ begin
             end;
             CBN_CLOSEUP:
             begin
-              // according to msdn CBN_CLOSEUP can happen before CBN_SELCHANGE and
-              // unfortunately it is simple truth. but we need correct order in the LCL
-              PostMessage(lWinControl.Handle, CN_COMMAND, WParam, LParam);
-              Exit;
+              if TCustomComboBox(lWinControl).Style in [csSimple, csDropDown] then
+                UpdateComboBoxText(TCustomComboBox(lWinControl));
             end;
           end;
       end;