diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
index 71f1f67e6d..7ba181328b 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
@@ -44,6 +44,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					Ui.OpenWindow("MAPCHOOSER_PANEL", new WidgetArgs()
 					{
 						{ "initialMap", preview.Uid },
+						{ "initialTab", MapClassification.System },
 						{ "onExit", () => { } },
 						{ "onSelect", (Action<string>)(uid => preview = Game.ModData.MapCache[uid]) },
 						{ "filter", MapVisibility.Lobby },
diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml
index a2e8f6b3c5..0205a16885 100644
--- a/mods/cnc/chrome/mapchooser.yaml
+++ b/mods/cnc/chrome/mapchooser.yaml
@@ -50,7 +50,7 @@ Container@MAPCHOOSER_PANEL:
 					Width: 140
 					Text: Official Maps
 				Button@USER_MAPS_TAB_BUTTON:
-					X: 15
+					X: 155
 					Y: 10
 					Height: 35
 					Width: 140