diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 766d2069..4a6af077 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -6601,6 +6601,7 @@ void Game::quittomenu(void)
     gamestate = TITLEMODE;
     graphics.fademode = 4;
     FILESYSTEM_unmountAssets();
+    cliplaytest = false;
     graphics.titlebg.tdrawback = true;
     graphics.flipmode = false;
     //Don't be stuck on the summary screen,
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index d3eca1f0..1720618f 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -1751,7 +1751,7 @@ bool editorclass::load(std::string& _path)
     }
 
     FILESYSTEM_unmountAssets();
-    if (game.playassets != "")
+    if (game.cliplaytest && game.playassets != "")
     {
         FILESYSTEM_mountAssets(game.playassets.c_str());
     }