diff --git a/OpenRA.Game/Traits/World/Shroud.cs b/OpenRA.Game/Traits/World/Shroud.cs
index f33fbdca83..cbfc695c81 100644
--- a/OpenRA.Game/Traits/World/Shroud.cs
+++ b/OpenRA.Game/Traits/World/Shroud.cs
@@ -77,6 +77,7 @@ namespace OpenRA.Traits
 
 		bool fogEnabled;
 		public bool FogEnabled { get { return !Disabled && fogEnabled; } }
+		public bool ExploreMapEnabled { get; private set; }
 
 		public int Hash { get; private set; }
 
@@ -96,8 +97,8 @@ namespace OpenRA.Traits
 			var gs = self.World.LobbyInfo.GlobalSettings;
 			fogEnabled = gs.OptionOrDefault("fog", info.FogEnabled);
 
-			var exploreMap = gs.OptionOrDefault("explored", info.ExploredMapEnabled);
-			if (exploreMap)
+			ExploreMapEnabled = gs.OptionOrDefault("explored", info.ExploredMapEnabled);
+			if (ExploreMapEnabled)
 				self.World.AddFrameEndTask(w => ExploreAll());
 		}
 
diff --git a/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs
index 3bd981a978..a97c5bd397 100644
--- a/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs
+++ b/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs
@@ -32,8 +32,8 @@ namespace OpenRA.Mods.Common.Traits
 
 		public override int GetSelectionShares(Actor collector)
 		{
-			// Don't ever hide the map for people who have GPS.
-			if (collector.Owner.HasFogVisibility)
+			// Don't hide the map if the shroud is force-revealed
+			if (collector.Owner.HasFogVisibility || collector.Owner.Shroud.ExploreMapEnabled)
 				return 0;
 
 			return base.GetSelectionShares(collector);