diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index fbee997c..09c5a9eb 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -117,6 +117,8 @@ void Game::init(void)
     musicmutebutton = 0;
 
     glitchrunkludge = false;
+    gamestate = TITLEMODE;
+    prevgamestate = TITLEMODE;
     hascontrol = true;
     jumpheld = false;
     advancetext = false;
@@ -7149,13 +7151,22 @@ void Game::unlockAchievement(const char *name) {
 
 void Game::mapmenuchange(const int newgamestate)
 {
+    prevgamestate = gamestate;
     gamestate = newgamestate;
     graphics.resumegamemode = false;
+    mapheld = true;
 
-    graphics.menuoffset = 240;
-    if (map.extrarow)
+    if (prevgamestate == GAMEMODE)
     {
-        graphics.menuoffset -= 10;
+        graphics.menuoffset = 240;
+        if (map.extrarow)
+        {
+            graphics.menuoffset -= 10;
+        }
+    }
+    else
+    {
+        graphics.menuoffset = 0;
     }
     graphics.oldmenuoffset = graphics.menuoffset;
 }
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index 5db0a21d..3af3f93c 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -206,6 +206,7 @@ public:
     bool glitchrunkludge;
 
     int gamestate;
+    int prevgamestate; //only used sometimes
     bool hascontrol, jumpheld;
     int jumppressed;
     int gravitycontrol;
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 217354ab..4a9a4c1d 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1769,7 +1769,16 @@ void gameinput()
         }
     }
 
-    if (!game.press_map) game.mapheld = false;
+    if (!game.press_map
+    //Extra conditionals as a kludge fix so if you open the quit menu during
+    //the script command gamemode(teleporter) and close it with Esc, it won't
+    //immediately open again
+    //We really need a better input system soon...
+    && !key.isDown(27)
+    && !key.isDown(game.controllerButton_esc))
+    {
+        game.mapheld = false;
+    }
 
     if (game.intimetrial && graphics.fademode == 1 && game.quickrestartkludge)
     {
@@ -2034,7 +2043,9 @@ void gameinput()
         }
     }
 
-    if ((key.isDown(27) || key.isDown(game.controllerButton_esc)) && (!map.custommode || map.custommodeforreal))
+    if (!game.mapheld
+    && (key.isDown(27) || key.isDown(game.controllerButton_esc))
+    && (!map.custommode || map.custommodeforreal))
     {
         game.mapheld = true;
         //Quit menu, same conditions as in game menu
diff --git a/desktop_version/src/RenderFixed.cpp b/desktop_version/src/RenderFixed.cpp
index c17e358e..921b1a6f 100644
--- a/desktop_version/src/RenderFixed.cpp
+++ b/desktop_version/src/RenderFixed.cpp
@@ -197,14 +197,27 @@ void maprenderfixed()
     graphics.oldmenuoffset = graphics.menuoffset;
     if (graphics.resumegamemode)
     {
-        graphics.menuoffset += 25;
-        int threshold = map.extrarow ? 230 : 240;
-        if (graphics.menuoffset >= threshold)
+        if (game.prevgamestate == GAMEMODE
+        //Failsafe: if the script command gamemode(teleporter) got ran and the
+        //cutscene stopped without doing gamemode(game), then we need to go
+        //back to GAMEMODE, not game.prevgamestate (TELEPORTERMODE)
+        || !script.running)
+        {
+            graphics.menuoffset += 25;
+            int threshold = map.extrarow ? 230 : 240;
+            if (graphics.menuoffset >= threshold)
+            {
+                graphics.menuoffset = threshold;
+                //go back to gamemode!
+                game.mapheld = true;
+                game.gamestate = GAMEMODE;
+            }
+        }
+        else
         {
-            graphics.menuoffset = threshold;
-            //go back to gamemode!
             game.mapheld = true;
-            game.gamestate = GAMEMODE;
+            game.gamestate = game.prevgamestate;
+            graphics.resumegamemode = false;
         }
     }
     else if (graphics.menuoffset > 0)
diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index f606cf00..39033468 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -1329,6 +1329,7 @@ void scriptclass::run()
 				else if (words[1] == "game")
 				{
 					graphics.resumegamemode = true;
+					game.prevgamestate = GAMEMODE;
 				}
 			}
 			else if (words[0] == "ifexplored")