diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 3b3d24c9e5..3a4079bc37 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -202,7 +202,7 @@ namespace OpenRA.Editor
 				p.Visible = true;
 				p.ResumeLayout();
 			}
-			pmMiniMap.Image = Minimap.TerrainBitmap(surface1.Map, true);
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 
 		static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
@@ -491,7 +491,7 @@ namespace OpenRA.Editor
 
 		private void OnSurfaceClicked(object sender, EventArgs e)
 		{
-			pmMiniMap.Image = Minimap.TerrainBitmap(surface1.Map, true);
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 	}
 }
\ No newline at end of file
diff --git a/OpenRA.Editor/MapSelect.cs b/OpenRA.Editor/MapSelect.cs
index 2ac5521a0b..c4260e3ab1 100644
--- a/OpenRA.Editor/MapSelect.cs
+++ b/OpenRA.Editor/MapSelect.cs
@@ -59,9 +59,7 @@ namespace OpenRA.Editor
 				pbMinimap.Image = null;
                 try
                 {
-					var b = Minimap.TerrainBitmap(map, true);
-					Minimap.AddStaticResources(map, b);
-					pbMinimap.Image = b;
+					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
                 }
                 catch (Exception ed)
                 {