diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 92cb8f09..a20bc247 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -2657,26 +2657,46 @@ void editorrender()
                     int tx=edentity[i].x-(ed.levx*40);
                     int tx2=edentity[i].x-(ed.levx*40);
                     int ty=edentity[i].y-(ed.levy*30);
-                    while(ed.spikefree(tx,ty)==0) tx--;
-                    while(ed.spikefree(tx2,ty)==0) tx2++;
-                    tx++;
+                    if (edentity[i].p4 != 1)
+                    {
+                        // Unlocked
+                        while(ed.spikefree(tx,ty)==0) tx--;
+                        while(ed.spikefree(tx2,ty)==0) tx2++;
+                        tx++;
+                        edentity[i].p2=tx;
+                        edentity[i].p3=(tx2-tx)*8;
+                    }
+                    else
+                    {
+                        // Locked
+                        tx = edentity[i].p2;
+                        tx2 = tx + edentity[i].p3/8;
+                    }
                     FillRect(graphics.backBuffer, (tx*8),(ty*8)+4, (tx2-tx)*8,1, graphics.getRGB(194,194,194));
                     fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(164,255,164));
-                    edentity[i].p2=tx;
-                    edentity[i].p3=(tx2-tx)*8;
                 }
                 else  //Vertical
                 {
                     int tx=edentity[i].x-(ed.levx*40);
                     int ty=edentity[i].y-(ed.levy*30);
                     int ty2=edentity[i].y-(ed.levy*30);
-                    while(ed.spikefree(tx,ty)==0) ty--;
-                    while(ed.spikefree(tx,ty2)==0) ty2++;
-                    ty++;
+                    if (edentity[i].p4 != 1)
+                    {
+                        // Unlocked
+                        while(ed.spikefree(tx,ty)==0) ty--;
+                        while(ed.spikefree(tx,ty2)==0) ty2++;
+                        ty++;
+                        edentity[i].p2=ty;
+                        edentity[i].p3=(ty2-ty)*8;
+                    }
+                    else
+                    {
+                        // Locked
+                        ty = edentity[i].p2;
+                        ty2 = ty + edentity[i].p3/8;
+                    }
                     FillRect(graphics.backBuffer, (tx*8)+3,(ty*8), 1,(ty2-ty)*8, graphics.getRGB(194,194,194));
                     fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(164,255,164));
-                    edentity[i].p2=ty;
-                    edentity[i].p3=(ty2-ty)*8;
                 }
                 break;
             case 13://Warp tokens
@@ -2749,26 +2769,46 @@ void editorrender()
                     int tx=edentity[i].x-(ed.levx*40);
                     int tx2=edentity[i].x-(ed.levx*40);
                     int ty=edentity[i].y-(ed.levy*30);
-                    while(ed.free(tx,ty)==0) tx--;
-                    while(ed.free(tx2,ty)==0) tx2++;
-                    tx++;
+                    if (edentity[i].p4 != 1)
+                    {
+                        // Unlocked
+                        while(ed.free(tx,ty)==0) tx--;
+                        while(ed.free(tx2,ty)==0) tx2++;
+                        tx++;
+                        edentity[i].p2=tx;
+                        edentity[i].p3=(tx2-tx)*8;
+                    }
+                    else
+                    {
+                        // Locked
+                        tx = edentity[i].p2;
+                        tx2 = tx + edentity[i].p3/8;
+                    }
                     fillboxabs((tx*8),(ty*8)+1, (tx2-tx)*8,6, graphics.getRGB(255,255,194));
                     fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(255,255,164));
-                    edentity[i].p2=tx;
-                    edentity[i].p3=(tx2-tx)*8;
                 }
                 else  //Vertical
                 {
                     int tx=edentity[i].x-(ed.levx*40);
                     int ty=edentity[i].y-(ed.levy*30);
                     int ty2=edentity[i].y-(ed.levy*30);
-                    while(ed.free(tx,ty)==0) ty--;
-                    while(ed.free(tx,ty2)==0) ty2++;
-                    ty++;
+                    if (edentity[i].p4 != 1)
+                    {
+                        // Unlocked
+                        while(ed.free(tx,ty)==0) ty--;
+                        while(ed.free(tx,ty2)==0) ty2++;
+                        ty++;
+                        edentity[i].p2=ty;
+                        edentity[i].p3=(ty2-ty)*8;
+                    }
+                    else
+                    {
+                        // Locked
+                        ty = edentity[i].p2;
+                        ty2 = ty + edentity[i].p3/8;
+                    }
                     fillboxabs((tx*8)+1,(ty*8), 6,(ty2-ty)*8, graphics.getRGB(255,255,194));
                     fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(255,255,164));
-                    edentity[i].p2=ty;
-                    edentity[i].p3=(ty2-ty)*8;
                 }
                 break;
             }