diff --git a/src/OverlayDockContainer.cpp b/src/OverlayDockContainer.cpp
index 1aca25e..c46dc61 100644
--- a/src/OverlayDockContainer.cpp
+++ b/src/OverlayDockContainer.cpp
@@ -196,9 +196,6 @@ COverlayDockContainer::~COverlayDockContainer()
 {
 	ADS_PRINT("~COverlayDockContainer");
 
-	// Remove event filter in case there are any queued messages
-    parent()->removeEventFilter(this);
-
 	if (d->DockManager)
 	{
 		parentContainer()->removeOverlayWidget(this);
@@ -312,6 +309,10 @@ void COverlayDockContainer::cleanupAndDelete()
         dockWidget->sideTabWidget()->setParent(dockWidget);
         dockWidget->sideTabWidget()->hide();
 	}
+
+	// Remove event filter in case there are any queued messages
+    parent()->removeEventFilter(this);
+
 	hide();
 	deleteLater();
 }