diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 11b01261..bf913c18 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -1595,9 +1595,30 @@ void Graphics::drawentities()
 {
     const int yoff = map.towermode ? lerp(map.oldypos, map.ypos) : 0;
 
-    for (int i = obj.entities.size() - 1; i >= 0; i--)
+    if (!map.custommode)
     {
-        drawentity(i, yoff);
+        for (int i = obj.entities.size() - 1; i >= 0; i--)
+        {
+            if (!obj.entities[i].ishumanoid())
+            {
+                drawentity(i, yoff);
+            }
+        }
+
+        for (int i = obj.entities.size() - 1; i >= 0; i--)
+        {
+            if (obj.entities[i].ishumanoid())
+            {
+                drawentity(i, yoff);
+            }
+        }
+    }
+    else
+    {
+        for (int i = obj.entities.size() - 1; i >= 0; i--)
+        {
+            drawentity(i, yoff);
+        }
     }
 }