diff --git a/docs/changes.txt b/docs/changes.txt
index 009aa9dd60..85fd4a59a6 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -166,6 +166,7 @@ wxMSW:
 - Fixed rendering of borders for wxTextCtrl with wxTE_RICH(2) style when
   using Windows XP's Classic UI theme.
 - Text controls with wxTE_RICH style now also generate wxClipboardTextEvents.
+- Fixed wxEVT_COMMAND_TEXT_ENTER generation in wxSpinCtrl.
 - Fixed wxSpinCtrl::GetClientSize() to return sensible value and not just
   spin button's client size.
 - Fixed IMPLEMENT_APP() to be compatible with the -WU flag of Borland C++
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 60f0733a0d..ec9106233e 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -177,7 +177,7 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
 
         case WM_GETDLGCODE:
             // we want to get WXK_RETURN in order to generate the event for it
-            return DLGC_WANTCHARS;
+            return DLGC_WANTARROWS;
     }
 
     return ::CallWindowProc(CASTWNDPROC spin->GetBuddyWndProc(),