diff --git a/docs/changes.txt b/docs/changes.txt
index 5e712b3e0a..cbc3cf5218 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -26,6 +26,7 @@ wxMSW:
 - Worked around an apparent bug in deferred window positioning (moving a
   window from (x, y) to (a, b) and back to (x, y) misses the last step) by
   checking window positions against corresponding sizer state, if any.
+- A control's text colour now reflects the system colour setting.
 
 wxMac:
 
diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d0395958a3..ce27473f21 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -339,6 +339,10 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
     {
         ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
     }
+    else
+    {
+        ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+    }
 
     WXHBRUSH hbr = 0;
     if ( !colBg.Ok() )