diff --git a/source/sw/src/rooms.cpp b/source/sw/src/rooms.cpp
index 90e07d57e..99e812ba6 100644
--- a/source/sw/src/rooms.cpp
+++ b/source/sw/src/rooms.cpp
@@ -846,10 +846,17 @@ GetUpperLowerSector(short match, int x, int y, short *upper, short *lower)
         *lower = -1;
         return;
     }
-    else
+    // Map rooms have NOT been dragged on top of each other
+    else if (sln == 1)
+    {
+        *lower = sectorlist[0];
+        *upper = sectorlist[0];
+        return;
+    }
+    // Map rooms HAVE been dragged on top of each other
     // inside will somtimes find that you are in two different sectors if the x,y
     // is exactly on a sector line.
-    if (sln > 2)
+    else if (sln > 2)
     {
         //DSPRINTF(ds, "TOO MANY SECTORS FOUND: x=%d, y=%d, match=%d, num sectors %d, %d, %d, %d, %d, %d", x, y, match, sln, sectorlist[0], sectorlist[1], sectorlist[2], sectorlist[3], sectorlist[4]);
         MONO_PRINT(ds);