diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index d2fdddaf..7f067cad 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -233,6 +233,8 @@ void Game::init(void)
     createmenu(Menu::mainmenu);
 
     wasintimetrial = false;
+    wasinintermission = false;
+    wasinnodeathmode = false;
     wasincustommode = false;
 
     deathcounts = 0;
@@ -1353,6 +1355,10 @@ void Game::updatestate()
             {
                 returntomenu(Menu::intermissionmenu);
             }
+            else if (wasinnodeathmode)
+            {
+                returntomenu(Menu::playmodes);
+            }
             else if (wasincustommode)
             {
                 returntomenu(Menu::levellist);
@@ -1367,6 +1373,7 @@ void Game::updatestate()
             }
             wasintimetrial = false;
             wasinintermission = false;
+            wasinnodeathmode = false;
             wasincustommode = false;
             state = 0;
             break;
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index d48b70cb..62a87855 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -237,6 +237,7 @@ public:
     //Menu kludge...
     bool wasintimetrial;
     bool wasinintermission;
+    bool wasinnodeathmode;
     bool wasincustommode;
 
 
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index d14cde31..faea3c8c 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1233,7 +1233,7 @@ void menuactionpress()
         //back
         music.playef(11);
         music.play(6);
-        game.returnmenu();
+        game.returntomenu(Menu::playmodes);
         map.nexttowercolour();
         break;
     case Menu::unlocktimetrials:
@@ -1970,6 +1970,7 @@ void mapinput()
                 if (game.intimetrial || game.insecretlab || game.nodeathmode) game.menukludge = true;
                 game.wasintimetrial = game.intimetrial;
                 game.wasinintermission = game.inintermission;
+                game.wasinnodeathmode = game.nodeathmode;
                 game.wasincustommode = map.custommode;
                 script.hardreset();
                 if(graphics.setflipmode) graphics.flipmode = true;