diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index 417cfcd889..f87be48c75 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -2460,7 +2460,8 @@ begin
   if WinProcess then
   begin
 
-    if (Msg=WM_CHAR) and (WParam=VK_RETURN) and (lWinControl is TCustomEdit)
+    if (Msg=WM_CHAR) and (WParam=VK_RETURN) and
+       ((lWinControl is TCustomEdit) or (lWinControl is TCustomCombobox))
       // and not TCustomEdit(lWinControl).WindowsSpecificOptionToEnableBeep
     then
       // this thing will beep, don't call defaultWindowProc