diff --git a/app/src/layout/Wnd.ts b/app/src/layout/Wnd.ts
index 36fbb834a..e09017af2 100644
--- a/app/src/layout/Wnd.ts
+++ b/app/src/layout/Wnd.ts
@@ -1009,7 +1009,11 @@ export class Wnd {
                     this.parent.addLayout(layout, item.id, after);
                     const movedWnd = this.parent.children.splice(after ? index : index + 1, 1)[0];
                     if (movedWnd.resize) {
-                        movedWnd.element.previousElementSibling.remove();
+                        if (movedWnd.element.previousElementSibling && movedWnd.element.previousElementSibling.classList.contains("layout__resize")) {
+                            movedWnd.element.previousElementSibling.remove();
+                        } else if (movedWnd.element.nextElementSibling && movedWnd.element.nextElementSibling.classList.contains("layout__resize")) {
+                            movedWnd.element.nextElementSibling.remove();
+                        }
                         movedWnd.resize = undefined;
                     }
                     if (after) {
diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts
index f6c0feaa5..b8b3b4db7 100644
--- a/app/src/layout/util.ts
+++ b/app/src/layout/util.ts
@@ -864,7 +864,8 @@ export const addResize = (obj: Layout | Wnd, after = true) => {
     }
     resizeElement.classList.add("layout__resize");
     if (after) {
-        obj.element.insertAdjacentElement("beforebegin", resizeElement);
+        obj.element.insertAdjacentElement((obj.element.previousElementSibling && !obj.element.previousElementSibling.classList.contains("layout__resize")) ?
+            "beforebegin" : "afterend", resizeElement);
     } else {
         obj.element.insertAdjacentElement("afterend", resizeElement);
     }