diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index a247a63..4c51b91 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1045,11 +1045,12 @@ void CDockAreaWidget::onAutoHideToggleRequested(CDockWidget* DockWidget, bool En
     if (Enable)
     {
         dockContainer()->createAndInitializeDockWidgetOverlayContainer(area, DockWidget);
-        toggleView(false);
+        DockWidget->toggleView(false);
     }
     else
 	{
         overlayDockContainer()->moveContentsToParent();
+		DockWidget->toggleView(true);
 	}
 }
 
diff --git a/src/DockFocusController.cpp b/src/DockFocusController.cpp
index 180219e..f1226b2 100644
--- a/src/DockFocusController.cpp
+++ b/src/DockFocusController.cpp
@@ -189,7 +189,7 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
 	}
 #endif
 
-	if (old && old->overlayDockContainer() && old != DockWidget)
+	if (old && old->overlayDockContainer() && old->overlayDockContainer()->isVisible() && old != FocusedDockWidget)
 	{
 		old->toggleView(false);
 	}