diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index e3c1fb24..ded07952 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -2900,12 +2900,6 @@ void editorrender()
                 BlitSurfaceColoured(graphics.sprites[ed.ghosts[i].frame],NULL, graphics.ghostbuffer, &drawRect, graphics.ct);
             }
         }
-        if (ed.currentghosts + 1 < (int)ed.ghosts.size()) {
-            ed.currentghosts++;
-            if (ed.zmod) ed.currentghosts++;
-        } else {
-            ed.currentghosts = (int)ed.ghosts.size() - 1;
-        }
         SDL_BlitSurface(graphics.ghostbuffer, NULL, graphics.backBuffer, &graphics.bg_rect);
     }
 
@@ -3625,6 +3619,16 @@ void editorlogic()
         ed.notedelay--;
     }
 
+    if (game.ghostsenabled)
+    {
+        if (ed.currentghosts + 1 < (int)ed.ghosts.size()) {
+            ed.currentghosts++;
+            if (ed.zmod) ed.currentghosts++;
+        } else {
+            ed.currentghosts = (int)ed.ghosts.size() - 1;
+        }
+    }
+
     if (!ed.settingsmod)
     {
         switch(ed.level[ed.levx+(ed.levy*ed.maxwidth)].warpdir)