diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index a82f90e3..bd5a199a 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -788,8 +788,7 @@ void gamelogic()
                     if (obj.entities[line].xp > 320)
                     {
                         obj.removeentity(line);
-                        game.swnmode = false;
-                        game.swngame = 6;
+                        game.swngame = 8;
                     }
                 }
             }
@@ -810,6 +809,22 @@ void gamelogic()
                     game.swncoldelay = 30;
                 }
             }
+            else if (game.swngame == 8)    //extra kludge if player dies after game a ends
+            {
+                bool square_onscreen = false;
+                for (size_t i = 0; i < obj.entities.size(); i++)
+                {
+                    if (obj.entities[i].type == 23)
+                    {
+                        square_onscreen = true;
+                        break;
+                    }
+                }
+                if (!square_onscreen)
+                {
+                    game.swnmode = false;
+                }
+            }
         }
 
         //Time trial stuff