diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index 23055c2187..ad748d6ca3 100644
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -130,6 +130,9 @@ void wxBufferedDC::UnMask()
     wxCoord x = 0,
             y = 0;
 
+    // Ensure the scale matches the device
+    SetUserScale(1.0, 1.0);
+    
     if ( m_style & wxBUFFER_CLIENT_AREA )
         GetDeviceOrigin(&x, &y);