diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index f0d4b283b..0a7f58482 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -3318,10 +3318,10 @@ void overheadeditor(void)
             zoom = max(zoom, ztarget);
         }
 
-        if (!((vel|angvel|svel) //DOWN_BK(MOVEFORWARD) || DOWN_BK(MOVEBACKWARD) || DOWN_BK(TURNLEFT) || DOWN_BK(TURNRIGHT)
+        if (!((vel|angvel|svel) || ztarget != zoom//DOWN_BK(MOVEFORWARD) || DOWN_BK(MOVEBACKWARD) || DOWN_BK(TURNLEFT) || DOWN_BK(TURNRIGHT)
                 || DOWN_BK(MOVEUP) || DOWN_BK(MOVEDOWN) || keystatus[0x10] || keystatus[0x11]
                 || keystatus[0x48] || keystatus[0x4b] || keystatus[0x4d] || keystatus[0x50]  // keypad keys
-                || bstatus || OSD_IsMoving() || ztarget != zoom))
+                || bstatus || OSD_IsMoving()))
         {
             if (totalclock > waitdelay)
             {
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 1988ef517..a18c21012 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -1117,7 +1117,7 @@ void yax_drawrooms(void (*SpriteAnimFunc)(int32_t,int32_t,int32_t,int32_t),
     g_nodraw = 0;
     scansector_collectsprites = 0;
 
-    if (editstatus==1)
+    if (editstatus==1 && in3dmode())
     {
         if (getrendermode() == REND_CLASSIC)
         {