diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp
index c12bac697..3c5772495 100644
--- a/src/blackgui/infoarea.cpp
+++ b/src/blackgui/infoarea.cpp
@@ -169,7 +169,9 @@ namespace BlackGui
     {
         if (!infoArea) { return false; }
         if (infoArea->isFloating()) { return false; }
-        return infoArea == this->getSelectedDockInfoArea();
+        if (!infoArea->isWidgetVisible()) { return false; }
+        if (!m_tabBar || m_tabBar->count() < 1) { return false; }
+        return true;
     }
 
     const CDockWidgetInfoArea *CInfoArea::getSelectedDockInfoArea() const