diff --git a/src/libs/advanceddockingsystem/dockfocuscontroller.cpp b/src/libs/advanceddockingsystem/dockfocuscontroller.cpp
index 4a8038f6eb6..b96c23f7cbe 100644
--- a/src/libs/advanceddockingsystem/dockfocuscontroller.cpp
+++ b/src/libs/advanceddockingsystem/dockfocuscontroller.cpp
@@ -215,14 +215,10 @@ namespace ADS
 
     void DockFocusController::onFocusedDockAreaViewToggled(bool open)
     {
-        if (d->m_dockManager->isRestoringState())
+        if (d->m_dockManager->isRestoringState() || !d->m_focusedArea || open)
             return;
 
-        DockAreaWidget* dockArea = qobject_cast<DockAreaWidget *>(sender());
-        if (!dockArea || open)
-            return;
-
-        auto container = dockArea->dockContainer();
+        auto container = d->m_focusedArea->dockContainer();
         auto openedDockAreas = container->openedDockAreas();
         if (openedDockAreas.isEmpty())
             return;