diff --git a/src/gui/MarblePickerGui.hx b/src/gui/MarblePickerGui.hx
index 74aff465..d04c4a1e 100644
--- a/src/gui/MarblePickerGui.hx
+++ b/src/gui/MarblePickerGui.hx
@@ -303,6 +303,7 @@ class MarblePickerGui extends GuiImage {
 		mbOpt.extent = new Vector(815, 94);
 		mbOpt.setCurrentOption(Settings.optionsSettings.marbleIndex);
 		var curToken = 0;
+
 		mbOpt.onChangeFunc = (idx) -> {
 			var selectedMarble = marbleData[idx];
 			Settings.optionsSettings.marbleIndex = idx;
@@ -312,10 +313,14 @@ class MarblePickerGui extends GuiImage {
 			Settings.optionsSettings.marbleShader = selectedMarble.shader;
 			var changeToken = curToken++;
 			ResourceLoader.load(Settings.optionsSettings.marbleModel).entry.load(() -> {
+				if (changeToken + 1 != curToken)
+					return;
 				@:privateAccess MarbleGame.instance.previewWorld.removeMarble(myMarb);
 				@:privateAccess MarbleGame.instance.previewWorld.spawnMarble(marb -> {
-					if (changeToken + 1 != curToken)
+					if (changeToken + 1 != curToken) {
+						@:privateAccess MarbleGame.instance.previewWorld.removeMarble(marb);
 						return;
+					}
 					var spawnPos = @:privateAccess MarbleGame.instance.scene.camera.pos.add(new Vector(0, 1, 1));
 					var velAdd = new Vector((1 - 2 * Math.random()) * 2, (1 - 2 * Math.random()) * 1.5, (1 - 2 * Math.random()) * 1);
 					velAdd = velAdd.add(new Vector(0, 3, 0));
@@ -343,6 +348,9 @@ class MarblePickerGui extends GuiImage {
 		backButton.accelerators = [hxd.Key.ENTER];
 		backButton.pressedAction = (e) -> {
 			this.bmp.visible = true;
+			mbOpt.onChangeFunc = (e) -> {
+				return false;
+			}; // Fix that marbug
 			MarbleGame.instance.setPreviewMission(prevPreview, () -> {
 				MarbleGame.canvas.setContent(new OptionsListGui());
 			}, false);