diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 1ca898e..f6e79a7 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -493,10 +493,7 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 //============================================================================
 void CDockAreaTitleBar::onAutoHideButtonClicked()
 {
-	if (d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable))
-	{
-        d->DockArea->toggleAutoHideArea(!d->DockArea->isAutoHide());
-	}
+	d->DockArea->toggleAutoHideArea(!d->DockArea->isAutoHide());
 }
 
 
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 5035237..8b7dc24 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1176,7 +1176,8 @@ void CDockAreaWidget::toggleAutoHideArea(bool Enable)
 
 	const auto area = dockContainer()->calculateSideTabBarArea(this);
 
-	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea))
+	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea)
+	 && features().testFlag(CDockWidget::DockWidgetPinnable))
 	{
 		for (const auto DockWidget : openedDockWidgets())
 		{