diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 6dc7d7b8..4f31b194 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -1595,7 +1595,6 @@ void gamelogic()
 #if !defined(NO_CUSTOM_LEVELS)
     if (game.shouldreturntoeditor)
     {
-        game.shouldreturntoeditor = false;
         game.returntoeditor();
     }
 #endif
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 1299f44a..e3c1fb24 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -2463,6 +2463,11 @@ void editormenurender(int tr, int tg, int tb)
 
 void editorrender()
 {
+    if (game.shouldreturntoeditor)
+    {
+        graphics.backgrounddrawn = false;
+    }
+
     //Draw grid
 
     FillRect(graphics.backBuffer, 0, 0, 320,240, graphics.getRGB(0,0,0));
@@ -3599,6 +3604,11 @@ void editorlogic()
     graphics.setcol(ed.entcol);
     ed.entcolreal = graphics.ct.colour;
 
+    if (game.shouldreturntoeditor)
+    {
+        game.shouldreturntoeditor = false;
+    }
+
     map.bypos -= 2;
     map.bscroll = -2;