diff --git a/TableturfBattleClient/index.html b/TableturfBattleClient/index.html
index 85357e3..a13865a 100644
--- a/TableturfBattleClient/index.html
+++ b/TableturfBattleClient/index.html
@@ -4,7 +4,7 @@
 		<meta charset="UTF-8"/>
 		<base href="https://questers-rest.andriocelos.net/tableturf/"/>
 		<script>
-			document.getElementsByTagName('base')[0].href = window.location.toString().replace(/\/(?:index.html|game\/[^/]*)$/, '/');
+			document.getElementsByTagName('base')[0].href = window.location.toString().replace(/\/(?:index.html|deckeditor|game\/[^/]*)$/, '/');
 		</script>
 		<title>Tableturf Battle</title>
 		<link rel="stylesheet" href="tableturf.css"/>
diff --git a/TableturfBattleClient/src/Pages/PreGamePage.ts b/TableturfBattleClient/src/Pages/PreGamePage.ts
index 6e71243..2dc72b1 100644
--- a/TableturfBattleClient/src/Pages/PreGamePage.ts
+++ b/TableturfBattleClient/src/Pages/PreGamePage.ts
@@ -147,6 +147,8 @@ function presetGameID(url: string) {
 	(document.getElementById('gameIDBox') as HTMLInputElement).value = url;
 	if (playerName)
 		tryJoinGame(playerName, url, true);
+	else
+		showSection('preGame');
 }
 
 preGameDeckEditorButton.addEventListener('click', e => {