diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 3da88c9404..cc88bf177f 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -404,6 +404,10 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 {
     event.Skip();
 
+    // Pressing the spin button should also give the focus to the text part of
+    // the control, at least this is how the native control behaves under MSW.
+    SetFocus();
+
     // Sync the textctrl since the user expects that the button will modify
     // what they see in the textctrl.
     SyncSpinToText(SendEvent_None);