diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 2d9092f666..aad9581f87 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -270,7 +270,13 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 event.SetInt(GetSelection());
-                ProcessCommand(event);
+                if ( ProcessCommand(event) )
+                {
+                    // don't let the event through to the native control
+                    // because it doesn't need it and may generate an annoying
+                    // beep if it gets it
+                    return true;
+                }
             }
 
             return HandleChar(wParam, lParam, true /* isASCII */);