diff --git a/docking-api/src/io/github/andrewauclair/moderndocking/internal/DockedAutoHidePanel.java b/docking-api/src/io/github/andrewauclair/moderndocking/internal/DockedAutoHidePanel.java
index 56ea5ce..b04ae12 100644
--- a/docking-api/src/io/github/andrewauclair/moderndocking/internal/DockedAutoHidePanel.java
+++ b/docking-api/src/io/github/andrewauclair/moderndocking/internal/DockedAutoHidePanel.java
@@ -70,9 +70,6 @@ public DockedAutoHidePanel(DockingAPI docking, Dockable dockable, RootDockingPan
         this.root = root;
 		this.toolbar = toolbar;
 
-		root.addComponentListener(this);
-		addComponentListener(this);
-
 		setLayout(new GridBagLayout());
 
 		GridBagConstraints gbc = new GridBagConstraints();
@@ -121,12 +118,18 @@ public void addNotify() {
 		super.addNotify();
 
 		slideBorder.addMouseMotionListener(this);
+
+		root.addComponentListener(this);
+		addComponentListener(this);
 	}
 
 	@Override
 	public void removeNotify() {
 		slideBorder.removeMouseMotionListener(this);
 
+		root.removeComponentListener(this);
+		removeComponentListener(this);
+
 		super.removeNotify();
 	}