diff --git a/docs/changes.txt b/docs/changes.txt
index c7d995f499..3034f9def1 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -112,6 +112,7 @@ All (Unix):
 
 wxMSW:
 
+- Fix keyboard support in wxSpinCtrl broken in 2.8.8.
 - Compile fix for WinCE in window.cpp (no VkKeyScan in Windows CE).
 
 wxGTK:
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index ec9106233e..46b0103c1c 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_WANTARROWS;
+            return DLGC_WANTALLKEYS;
     }
 
     return ::CallWindowProc(CASTWNDPROC spin->GetBuddyWndProc(),