diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 074301d6..ac29360f 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -1686,15 +1686,21 @@ void editorclass::switch_enemy(const bool reversed /*= false*/)
     }
     edlevelclass& room = level[roomnum];
 
+    int enemy = room.enemytype;
+
     if (reversed)
     {
-        room.enemytype--;
+        enemy--;
     }
     else
     {
-        room.enemytype++;
+        enemy++;
     }
 
+    const int modulus = 10;
+    enemy = (enemy % modulus + modulus) % modulus;
+    room.enemytype = enemy;
+
     note = "Enemy Type Changed";
     notedelay = 45;
 }