diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractMergedWindow.java b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractMergedWindow.java
index 05e8fa4..271085f 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractMergedWindow.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractMergedWindow.java
@@ -24,8 +24,6 @@ public abstract class AbstractMergedWindow extends AbstractDoubleWindow {
     public AbstractMergedWindow(Player player, ComponentWrapper title, AbstractGui gui, Inventory upperInventory, boolean closeable) {
         super(player, title, gui.getSize(), upperInventory, closeable);
         this.gui = gui;
-        
-        gui.addParent(this);
     }
     
     @Override
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSingleWindow.java b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSingleWindow.java
index 129aaaa..c46c681 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSingleWindow.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSingleWindow.java
@@ -32,8 +32,6 @@ public abstract class AbstractSingleWindow extends AbstractWindow {
         this.gui = gui;
         this.size = gui.getSize();
         this.inventory = inventory;
-        
-        gui.addParent(this);
     }
     
     @Override
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java
index d5b6b04..d31952a 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java
@@ -27,9 +27,6 @@ public abstract class AbstractSplitWindow extends AbstractDoubleWindow {
         super(player, title, upperGui.getSize() + lowerGui.getSize(), upperInventory, closeable);
         this.upperGui = upperGui;
         this.lowerGui = lowerGui;
-        
-        upperGui.addParent(this);
-        lowerGui.addParent(this);
     }
     
     @Override
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
index 59a95ee..d7d54ef 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
@@ -261,6 +261,7 @@ public abstract class AbstractWindow implements Window, GuiParent {
         hasHandledClose = false;
         initItems();
         WindowManager.getInstance().addWindow(this);
+        for (AbstractGui gui : getGuis()) gui.addParent(this);
         openInventory(viewer);
     }
     
@@ -330,9 +331,8 @@ public abstract class AbstractWindow implements Window, GuiParent {
                     ((SlotElement.InventorySlotElement) slotElement).getInventory().removeWindow(this);
                 }
             });
-        
-        Arrays.stream(getGuis())
-            .forEach(gui -> gui.removeParent(this));
+
+        for (AbstractGui gui : getGuis()) gui.removeParent(this);
     }
     
     @Override