diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
index a5862fe0..889e6696 100644
--- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
+++ b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
@@ -114,8 +114,11 @@ public abstract class AbstractGuiContainer<T extends AbstractGuiContainer<T>>
 
     @Override
     public T removeElement(GuiElement element) {
-        if (elements.remove(element) != null && layedOutElements != null) {
-            layedOutElements.remove(element);
+        if (elements.remove(element) != null) {
+            element.setContainer(null);
+            if (layedOutElements != null) {
+                layedOutElements.remove(element);
+            }
         }
         return getThis();
     }