diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 2ad3d694..a506c4a8 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -6863,9 +6863,7 @@ void Game::unlockAchievement(const char *name) {
 
 void Game::mapmenuchange(const int newgamestate, const bool user_initiated)
 {
-    if (user_initiated
-    && graphics.menuoffset > 0
-    && graphics.menuoffset < 240)
+    if (user_initiated && graphics.resumegamemode)
     {
         return;
     }
diff --git a/desktop_version/src/RenderFixed.cpp b/desktop_version/src/RenderFixed.cpp
index 8966724e..c8ee3809 100644
--- a/desktop_version/src/RenderFixed.cpp
+++ b/desktop_version/src/RenderFixed.cpp
@@ -213,6 +213,7 @@ void maprenderfixed(void)
                 //go back to gamemode!
                 game.mapheld = true;
                 game.gamestate = GAMEMODE;
+                graphics.resumegamemode = false;
             }
         }
         else