diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index cb2860f..bc047da 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -412,6 +412,11 @@ void CDockAreaTitleBar::onUndockButtonClicked()
 {
 	if (d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable))
 	{
+        if (d->DockArea->autoHideDockContainer())
+        {
+            d->DockArea->autoHideDockContainer()->cleanupAndDelete();
+        }
+
 		d->makeAreaFloating(mapFromGlobal(QCursor::pos()), DraggingInactive);
 	}
 }