diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index b6496715e7..317347a31d 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -351,6 +351,7 @@ namespace OpenRA.Editor
 				SaveAsClicked(sender, e);
 			else
 			{
+				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
 				surface1.Map.Package = new Folder(loadedMapName);
 				SavePreviewImage(Path.Combine(loadedMapName, "preview.png"));
 				surface1.Map.Save(loadedMapName);