diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 1f845e6028..a048d8a00d 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -94,6 +94,9 @@ namespace OpenRA.Editor
 
 			// construct the palette of tiles
 
+			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
+			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
+
 			foreach (var n in tileset.tiles.Keys)
 			{
 				try
@@ -186,6 +189,8 @@ namespace OpenRA.Editor
 			}
 
 			surface1.BindResourceTemplates(resourceTemplates);
+
+			foreach (var p in palettes) { p.Visible = true; p.ResumeLayout(); }
 		}
 
 		void LocateGameRoot()