diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
index 961106f6c7..3284b5b16c 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.RA.Widgets
 			}
 
 			var statsButton = dialog.Get<ButtonWidget>("STATS_BUTTON");
-			statsButton.IsVisible = () => !(world.Map.Type == "Mission" || world.Map.Type == "Campaign") || world.IsReplay;
+			statsButton.IsVisible = () => !world.Map.Visibility.HasFlag(MapVisibility.MissionSelector) || world.IsReplay;
 			statsButton.OnClick = () =>
 			{
 				showStats = true;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
index 0f1ff1c60b..ba212be7ae 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
@@ -100,7 +100,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			var diplomacy = widget.GetOrNull<MenuButtonWidget>("DIPLOMACY_BUTTON");
 			if (diplomacy != null)
 			{
-				diplomacy.Visible = world.Players.Any(a => a != world.LocalPlayer && !a.NonCombatant);
+				diplomacy.Visible = !world.Map.Visibility.HasFlag(MapVisibility.MissionSelector) && world.Players.Any(a => a != world.LocalPlayer && !a.NonCombatant);
 				diplomacy.IsDisabled = () => disableSystemButtons;
 				diplomacy.OnClick = () => OpenMenuPanel(diplomacy);
 			}