diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index c21fbd8fa0..2a0ad74624 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -287,7 +287,9 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
         sizeNew = image->GetSize();
 
     Free();
-    InvalidateBestSize();
+
+    if ( sizeNew != sizeOld )
+        InvalidateBestSize();
 
     m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
     // the image has already been copied