diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index b2e25066..993e54ad 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -7763,4 +7763,5 @@ void Game::returntopausemenu()
     gamestate = MAPMODE;
     map.kludge_to_bg();
     map.tdrawback = true;
+    game.mapheld = true;
 }
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 64659488..5806972e 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1958,20 +1958,24 @@ void mapinput()
         {
             game.press_action = true;
         }
-        if (game.menupage < 12)
+        if (game.menupage < 12 || (game.menupage >= 30 && game.menupage <= 33))
         {
             if (key.isDown(KEYBOARD_ENTER) || key.isDown(game.controllerButton_map) ) game.press_map = true;
-            if (key.isDown(27))
+            if (key.isDown(27) && !game.mapheld)
             {
                 game.mapheld = true;
                 if (game.menupage < 9)
                 {
                     game.menupage = 30;
                 }
-                else
+                else if (game.menupage < 12)
                 {
                     game.menupage = 31;
                 }
+                else
+                {
+                    graphics.resumegamemode = true;
+                }
             }
         }
         else