diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 16e255dc..2d30916e 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1717,6 +1717,7 @@ void gameinput()
             {
                 script.load(obj.blocks[game.activeactivity].script);
                 obj.removeblock(game.activeactivity);
+                game.activeactivity = -1;
             }
         }else{
           game.gamestate = EDITORMODE;
@@ -1823,6 +1824,7 @@ void gameinput()
                         {
                             script.load(obj.blocks[game.activeactivity].script);
                             obj.removeblock(game.activeactivity);
+                            game.activeactivity = -1;
                         }
                     }
                     else if (game.swnmode == 1 && game.swngame == 1)
@@ -2058,6 +2060,7 @@ void mapinput()
         FillRect(graphics.menubuffer, 0x000000);
         graphics.resumegamemode = true;
         obj.removeallblocks();
+        game.activeactivity = -1;
         game.menukludge = false;
         if (game.menupage >= 20)
         {