diff --git a/mods/ra/chrome/create-server.yaml b/mods/ra/chrome/create-server.yaml
new file mode 100644
index 0000000000..ded30d7863
--- /dev/null
+++ b/mods/ra/chrome/create-server.yaml
@@ -0,0 +1,87 @@
+Background@CREATESERVER_BG:
+	Id:CREATESERVER_BG
+	Logic:CreateServerMenuLogic
+	X:(WINDOW_RIGHT - WIDTH)/2
+	Y:(WINDOW_BOTTOM - HEIGHT)/2
+	Width:400
+	Height:240
+	Children:
+		Label@LABEL_TITLE:
+			Id:LABEL_TITLE
+			X:0
+			Y:20
+			Width:400
+			Height:25
+			Text:Create Server
+			Align:Center
+			Font:Bold
+		Label@GAME_TITLE_LABEL:
+			Id:GAME_TITLE_LABEL
+			X:50
+			Y:59
+			Width:95
+			Height:25
+			Align: Right
+			Text:Game Title:
+		TextField@GAME_TITLE:
+			Id:GAME_TITLE
+			X:150
+			Y:60
+			Width:210
+			MaxLength:50
+			Height:25
+			Text:OpenRA Game
+		Label@EXTERNAL_PORT_LABEL:
+			Id:EXTERNAL_PORT_LABEL
+			X:50
+			Y:94
+			Width:95
+			Height:25
+			Align: Right
+			Text:External Port:
+		TextField@EXTERNAL_PORT:
+			Id:EXTERNAL_PORT
+			X:150
+			Y:95
+			Width:50
+			MaxLength:5
+			Height:25
+			Text:OpenRA Game
+		Label@LISTEN_PORT_LABEL:
+			Id:LISTEN_PORT_LABEL
+			X:210
+			Y:94
+			Width:95
+			Height:25
+			Align: Right
+			Text:Listen Port:
+		TextField@LISTEN_PORT:
+			Id:LISTEN_PORT
+			X:310
+			Y:95
+			Width:50
+			MaxLength:5
+			Height:25
+		Checkbox@CHECKBOX_ONLINE:
+			Id:CHECKBOX_ONLINE
+			X:165
+			Y:130
+			Width:300
+			Height:20
+			Text:Advertise game Online
+		Button@BUTTON_START:
+			Id:BUTTON_START
+			X:130
+			Y:PARENT_BOTTOM - 45
+			Width:120
+			Height:25
+			Text:Create
+			Font:Bold
+		Button@BUTTON_CANCEL:
+			Id:BUTTON_CANCEL
+			X:260
+			Y:PARENT_BOTTOM - 45
+			Width:120
+			Height:25
+			Text:Cancel
+			Font:Bold
diff --git a/mods/ra/chrome/serverbrowser.yaml b/mods/ra/chrome/serverbrowser.yaml
index 1f5509d321..e5048460e9 100644
--- a/mods/ra/chrome/serverbrowser.yaml
+++ b/mods/ra/chrome/serverbrowser.yaml
@@ -1,90 +1,3 @@
-Background@CREATESERVER_BG:
-	Id:CREATESERVER_BG
-	Logic:CreateServerMenuLogic
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:400
-	Height:240
-	Children:
-		Label@LABEL_TITLE:
-			Id:LABEL_TITLE
-			X:0
-			Y:20
-			Width:400
-			Height:25
-			Text:Create Server
-			Align:Center
-			Font:Bold
-		Label@GAME_TITLE_LABEL:
-			Id:GAME_TITLE_LABEL
-			X:50
-			Y:59
-			Width:95
-			Height:25
-			Align: Right
-			Text:Game Title:
-		TextField@GAME_TITLE:
-			Id:GAME_TITLE
-			X:150
-			Y:60
-			Width:210
-			MaxLength:50
-			Height:25
-			Text:OpenRA Game
-		Label@EXTERNAL_PORT_LABEL:
-			Id:EXTERNAL_PORT_LABEL
-			X:50
-			Y:94
-			Width:95
-			Height:25
-			Align: Right
-			Text:External Port:
-		TextField@EXTERNAL_PORT:
-			Id:EXTERNAL_PORT
-			X:150
-			Y:95
-			Width:50
-			MaxLength:5
-			Height:25
-			Text:OpenRA Game
-		Label@LISTEN_PORT_LABEL:
-			Id:LISTEN_PORT_LABEL
-			X:210
-			Y:94
-			Width:95
-			Height:25
-			Align: Right
-			Text:Listen Port:
-		TextField@LISTEN_PORT:
-			Id:LISTEN_PORT
-			X:310
-			Y:95
-			Width:50
-			MaxLength:5
-			Height:25
-		Checkbox@CHECKBOX_ONLINE:
-			Id:CHECKBOX_ONLINE
-			X:165
-			Y:130
-			Width:300
-			Height:20
-			Text:Advertise game Online
-		Button@BUTTON_START:
-			Id:BUTTON_START
-			X:130
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Create
-			Font:Bold
-		Button@BUTTON_CANCEL:
-			Id:BUTTON_CANCEL
-			X:260
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Cancel
-			Font:Bold
 Background@JOINSERVER_BG:
 	Id:JOINSERVER_BG
 	Logic:ServerBrowserLogic
@@ -361,4 +274,4 @@ Background@CONNECTING_BG:
 			Width:160
 			Height:25
 			Text:Abort
-			Font:Bold
\ No newline at end of file
+			Font:Bold
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 3fdc539970..1181ed1de2 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -58,6 +58,7 @@ ChromeLayout:
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/gamelobby.yaml
+	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/ra/chrome/dropdowns.yaml