diff --git a/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs b/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
index 76f248c273..14d3d40ff5 100644
--- a/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
+++ b/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
@@ -34,7 +34,7 @@ namespace OpenRA.Widgets.Delegates
 			cs.GetWidget("BUTTON_START").OnMouseUp = mi => {
 				r.OpenWindow("SERVER_LOBBY");
 				
-				var map = Game.modData.AvailableMaps.Keys.FirstOrDefault();
+				var map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Key;
 				
 				settings.Server.Name = cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text;
 				settings.Server.ListenPort = int.Parse(cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text);
diff --git a/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs b/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs
index 5b47c5cdc3..11616c0039 100644
--- a/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs
+++ b/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs
@@ -74,7 +74,7 @@ namespace OpenRA.Widgets.Delegates
 			if (uid != null)
 				Map = Game.modData.AvailableMaps[uid];
 			else
-				Map = Game.modData.AvailableMaps.FirstOrDefault().Value;
+				Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
 		}
 	}
 }
diff --git a/mods/ra/maps/boomer-test-map/map.yaml b/mods/ra/maps/boomer-test-map/map.yaml
index 8e9ca42a71..e17503e8f9 100644
--- a/mods/ra/maps/boomer-test-map/map.yaml
+++ b/mods/ra/maps/boomer-test-map/map.yaml
@@ -1,4 +1,4 @@
-Selectable: True
+Selectable: False
 
 MapFormat: 3