diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs
index 4ecf69e976..e3da9d8192 100644
--- a/OpenRA.Game/Map/Map.cs
+++ b/OpenRA.Game/Map/Map.cs
@@ -603,6 +603,9 @@ namespace OpenRA
 
 			// Update existing package
 			Container.Write(entries);
+
+			// Update UID to match the newly saved data
+			Uid = ComputeHash();
 		}
 
 		public CellLayer<TerrainTile> LoadMapTiles()
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
index e726e3335c..fad645bbd5 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
@@ -145,9 +145,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 				map.Save(combinedPath);
 
-				// Reload map to calculate new UID
-				map = new Map(combinedPath);
-
 				// Update the map cache so it can be loaded without restarting the game
 				var classification = mapDirectories[directoryDropdown.Text];
 				Game.ModData.MapCache[map.Uid].UpdateFromMap(map, classification);