diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 7449a7b526..0ef87a536a 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -91,7 +91,7 @@ public:
     virtual wxTextPos GetLastPosition() const;
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
-    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
+    virtual void SetSelection(int n);
     virtual void SetSelection(long from, long to);
     virtual int GetSelection() const;
     virtual void GetSelection(long* from, long* to) const;
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index d85ef7e887..c8fd88ae27 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -755,6 +755,16 @@ void wxComboBox::Clear()
     m_value.clear();
 }
 
+// ----------------------------------------------------------------------------
+// overridden wxChoice methods
+// ----------------------------------------------------------------------------
+
+void wxComboBox::SetSelection(int n)
+{
+    wxChoice::SetSelection(n);
+    m_selectionOld = n;
+}
+
 // ----------------------------------------------------------------------------
 // standard event handling
 // ----------------------------------------------------------------------------