diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 269ae3282c..0e837b1718 100755
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -306,6 +306,8 @@ namespace OpenRA
 			{
 				while (true)
 				{
+					Game.Settings.Server.Map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map);
+					Game.Settings.Save();
 					Game.CreateServer(new ServerSettings(Game.Settings.Server));
 					while(true)
 					{