diff --git a/src/Console.hx b/src/Console.hx
index 78ad2469..7c1f2204 100644
--- a/src/Console.hx
+++ b/src/Console.hx
@@ -1,6 +1,8 @@
 package src;
 
+#if !js
 import sys.FileSystem;
+#end
 import mis.MisParser;
 import src.Settings;
 import src.Debug;
diff --git a/src/MarbleGame.hx b/src/MarbleGame.hx
index 54ad3e9c..15d118f8 100644
--- a/src/MarbleGame.hx
+++ b/src/MarbleGame.hx
@@ -1,5 +1,9 @@
 package src;
 
+import gui.MainMenuGui;
+#if !js
+import gui.ReplayCenterGui;
+#end
 import gui.ReplayNameDlg;
 import gui.ConsoleDlg;
 import src.Replay;
@@ -249,12 +253,20 @@ class MarbleGame {
 		Console.log("Quitting mission");
 		world.setCursorLock(false);
 		paused = false;
-		var pmg = new PlayMissionGui();
-		PlayMissionGui.currentSelectionStatic = world.mission.index;
-		PlayMissionGui.currentGameStatic = world.mission.game;
+		if (world.isWatching) {
+			#if !js
+			canvas.setContent(new ReplayCenterGui());
+			#else
+			canvas.setContent(new MainMenuGui());
+			#end
+		} else {
+			var pmg = new PlayMissionGui();
+			PlayMissionGui.currentSelectionStatic = world.mission.index;
+			PlayMissionGui.currentGameStatic = world.mission.game;
+			canvas.setContent(pmg);
+		}
 		world.dispose();
 		world = null;
-		canvas.setContent(pmg);
 
 		Settings.save();
 	}
diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx
index 00d12d56..78653d60 100644
--- a/src/MarbleWorld.hx
+++ b/src/MarbleWorld.hx
@@ -1,6 +1,10 @@
 package src;
 
+#if js
+import gui.MainMenuGui;
+#else
 import gui.ReplayCenterGui;
+#end
 import gui.ReplayNameDlg;
 import collision.Collision;
 import shapes.MegaMarble;
@@ -1164,8 +1168,11 @@ class MarbleWorld extends Scheduler {
 				}
 				this.setCursorLock(false);
 				this.dispose();
+				#if !js
 				MarbleGame.canvas.setContent(new ReplayCenterGui());
+				#end
 				#if js
+				MarbleGame.canvas.setContent(new MainMenuGui());
 				var pointercontainer = js.Browser.document.querySelector("#pointercontainer");
 				pointercontainer.hidden = false;
 				#end