diff --git a/OpenRA.Game/Traits/Player/DeveloperMode.cs b/OpenRA.Game/Traits/Player/DeveloperMode.cs
index 5a8d8a9c44..31002de341 100644
--- a/OpenRA.Game/Traits/Player/DeveloperMode.cs
+++ b/OpenRA.Game/Traits/Player/DeveloperMode.cs
@@ -24,6 +24,7 @@ namespace OpenRA.Traits
 		public bool ShowCombatGeometry;
 		public bool ShowDebugGeometry;
 		public bool ShowDepthPreview;
+		public bool ShowActorTags;
 
 		public object Create(ActorInitializer init) { return new DeveloperMode(this); }
 	}
@@ -43,6 +44,7 @@ namespace OpenRA.Traits
 		public bool ShowCombatGeometry;
 		public bool ShowDebugGeometry;
 		public bool ShowDepthPreview;
+		public bool ShowActorTags;
 
 		public bool EnableAll;
 
@@ -58,6 +60,7 @@ namespace OpenRA.Traits
 			ShowCombatGeometry = info.ShowCombatGeometry;
 			ShowDebugGeometry = info.ShowDebugGeometry;
 			ShowDepthPreview = info.ShowDepthPreview;
+			ShowActorTags = info.ShowActorTags;
 		}
 
 		public void ResolveOrder(Actor self, Order order)
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
index 5113e41ffa..0c0d1dd58d 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
@@ -126,6 +126,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				showAstarCostCheckbox.IsChecked = () => dbgOverlay != null ? dbgOverlay.Visible : false;
 				showAstarCostCheckbox.OnClick = () => { if (dbgOverlay != null) dbgOverlay.Visible ^= true; };
 			}
+
+			var showActorTagsCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_ACTOR_TAGS");
+			if (showActorTagsCheckbox != null)
+			{
+				showActorTagsCheckbox.IsChecked = () => devTrait.ShowActorTags;
+				showActorTagsCheckbox.OnClick = () => devTrait.ShowActorTags ^= true;
+			}
 		}
 
 		public void Order(World world, string order)