diff --git a/OpenRA.Editor/Surface.cs b/OpenRA.Editor/Surface.cs
index d5c235a99c..eb3feaa134 100644
--- a/OpenRA.Editor/Surface.cs
+++ b/OpenRA.Editor/Surface.cs
@@ -491,7 +491,7 @@ namespace OpenRA.Editor
 			if (currentTool == null)
 			{
 				var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
-				if (x.Key != null)
+				if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type))
 					DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]);
 			}
 		}