diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 2b38bc7310..eb639084f4 100644
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -614,11 +614,14 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
 
         SHFILEINFO fi;
         long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), flags);
-        m_icons[type].SetHICON((WXHICON)fi.hIcon);
         if (!rc || !fi.hIcon)
         {
             wxLogError(_("Cannot load icon from '%s'."), m_volName.c_str());
         }
+        else
+        {
+            m_icons[type].CreateFromHICON((WXHICON)fi.hIcon);
+        }
     }
 
     return m_icons[type];