diff --git a/src/common/image.cpp b/src/common/image.cpp
index 5d65ecaa9c..2c61998e6d 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -2306,7 +2306,10 @@ static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type)
         image.SetMaskColour(0xc0, 0xc0, 0xc0);
     }
 
-    image.InitAlpha();
+    // We could have already loaded alpha from the resources, but if not,
+    // initialize it now using the mask.
+    if ( !image.HasAlpha() )
+        image.InitAlpha();
 
     return image;
 }