diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 014e50d81c..99c513d9d2 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -409,6 +409,12 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     if ( !value.empty() )
     {
         SetValue(value);
+        m_oldValue = (int) wxAtol(value);
+    }
+    else
+    {
+        SetValue(wxString::Format(wxT("%d"), initial));
+        m_oldValue = initial;
     }
 
     // do it after finishing with m_hwndBuddy creation to avoid generating