diff --git a/docs/changes.txt b/docs/changes.txt
index b471bee95c..3f5989e26b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -617,6 +617,7 @@ wxMSW:
 - Fix coordinates of EVT_MOUSEWHEEL in frames with toolbars (LtJax).
 - Support "show" verb as well as "open" in wxFileType (Eric Jensen).
 - Fix display of bitmaps with alpha in wxStaticBitmap (Artur Wieczorek).
+- Fix wxClientDC::Clear() for scrolled windows (Artur Wieczorek).
 - Make wxPrinterDC::DrawIcon() actually work (Artur Wieczorek).
 
 wxOSX:
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 2db8a6065c..e6c375b364 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -694,11 +694,13 @@ void wxMSWDCImpl::Clear()
         if (!m_selectedBitmap.IsOk())
             return;
 
-        rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
-        rect.right = m_selectedBitmap.GetWidth()-m_deviceOriginX;
-        rect.bottom = m_selectedBitmap.GetHeight()-m_deviceOriginY;
+        rect.left = rect.top = 0;
+        rect.right = m_selectedBitmap.GetWidth();
+        rect.bottom = m_selectedBitmap.GetHeight();
     }
 
+    ::OffsetRect(&rect, -m_deviceOriginX, -m_deviceOriginY);
+
 #ifndef __WXWINCE__
     (void) ::SetMapMode(GetHdc(), MM_TEXT);
 #endif