diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs
index c76986bf09..2165988fef 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs
@@ -144,17 +144,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 				if (cat.HasFlag(MapOverlays.Buildable))
 				{
-					var buildableTerrainTrait = world.WorldActor.TraitOrDefault<BuildableTerrainOverlay>();
-					if (buildableTerrainTrait != null)
+					var buildableTerrainTrait = world.WorldActor.Trait<BuildableTerrainOverlay>();
+					category.OnClick = () =>
 					{
-						category.OnClick = () =>
-						{
-							overlays ^= cat;
-							buildableTerrainTrait.Enabled = overlays.HasFlag(MapOverlays.Buildable);
-						};
-					}
-					else
-						continue;
+						overlays ^= cat;
+						buildableTerrainTrait.Enabled = overlays.HasFlag(MapOverlays.Buildable);
+					};
 				}
 
 				categoriesPanel.AddChild(category);