diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp
index 4f91149..3c64940 100644
--- a/src/AutoHideDockContainer.cpp
+++ b/src/AutoHideDockContainer.cpp
@@ -167,14 +167,8 @@ AutoHideDockContainerPrivate::AutoHideDockContainerPrivate(
 //============================================================================
 CDockContainerWidget* CAutoHideDockContainer::parentContainer() const
 {
-	if (d->DockArea)
-	{
-		return d->DockArea->dockContainer();
-	}
-	else
-	{
-		return internal::findParent<CDockContainerWidget*>(this);
-	}
+	// Don't rely on the dock area parent container, when dragging or floating the parent container can change
+    return internal::findParent<CDockContainerWidget*>(this);
 }
 
 
@@ -357,7 +351,7 @@ void CAutoHideDockContainer::moveContentsToParent()
 
 
 //============================================================================
-void CAutoHideDockContainer::cleanupAndDelete()
+void CAutoHideDockContainer::cleanupAndDelete(bool deleteDockArea)
 {
 	const auto dockWidget = d->DockWidget;
 	if (dockWidget)
@@ -371,6 +365,15 @@ void CAutoHideDockContainer::cleanupAndDelete()
 
 	hide();
 	deleteLater();
+
+	// Schedule deletion of the dock area after the auto hide widget
+	// Otherwise, there are issues with the windows native event handler
+	if (deleteDockArea)
+	{
+        d->DockArea->setParent(nullptr);
+        d->DockArea->deleteLater();
+		d->DockArea = nullptr;
+	}
 }
 
 
diff --git a/src/AutoHideDockContainer.h b/src/AutoHideDockContainer.h
index c00f114..dbd78f8 100644
--- a/src/AutoHideDockContainer.h
+++ b/src/AutoHideDockContainer.h
@@ -134,8 +134,10 @@ public:
 
 	/**
 	 * Cleanups up the side tab widget and then deletes itself
+	 * deleteDockArea = true is set, this will also delete the dockArea. 
+	 * Avoid deleting the dock area floating drag, where the dock area is simply moved into another container
 	 */
-	void cleanupAndDelete();
+	void cleanupAndDelete(bool deleteDockArea = true);
 
 	/*
 	 * Toggles the auto Hide dock container widget
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index 91316cb..a7a0f2d 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -2073,12 +2073,16 @@ void CDockContainerWidget::registerAutoHideWidget(CAutoHideDockContainer* Autohi
 	d->AutoHideWidgets.append(AutohideWidget);
 	Q_EMIT autoHideWidgetCreated(AutohideWidget);
     ADS_PRINT("d->AutoHideWidgets.count() " << d->AutoHideWidgets.count());
+	qInfo()<< this << "Size after registering: " << d->AutoHideWidgets.size();
 }
 
 //============================================================================
 void CDockContainerWidget::removeAutoHideWidget(CAutoHideDockContainer* AutohideWidget)
 {
+	qInfo() << this << "Auto hide widgets: " << d->AutoHideWidgets;
+	qInfo() << "Size before removing: " << d->AutoHideWidgets.size();
 	d->AutoHideWidgets.removeAll(AutohideWidget);
+	qInfo() << "Size after removing: " << d->AutoHideWidgets.size();
 }
 
 //============================================================================
diff --git a/src/FloatingDragPreview.cpp b/src/FloatingDragPreview.cpp
index a48611d..24be3ea 100644
--- a/src/FloatingDragPreview.cpp
+++ b/src/FloatingDragPreview.cpp
@@ -371,11 +371,11 @@ void CFloatingDragPreview::cleanupAutoHideContainerWidget()
 	auto DroppedArea = qobject_cast<CDockAreaWidget*>(d->Content);
 	if (DroppedDockWidget && DroppedDockWidget->autoHideDockContainer())
 	{
-		DroppedDockWidget->autoHideDockContainer()->cleanupAndDelete();
+		DroppedDockWidget->autoHideDockContainer()->cleanupAndDelete(false);
 	}
 	if (DroppedArea && DroppedArea->autoHideDockContainer())
 	{
-		DroppedArea->autoHideDockContainer()->cleanupAndDelete();
+		DroppedArea->autoHideDockContainer()->cleanupAndDelete(false);
 	}
 }