diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 1244a6b23af..8cb57db9383 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -810,7 +810,7 @@ int CCompositor::getWindowsOnWorkspace(const int& id) {
 
 CWindow* CCompositor::getFirstWindowOnWorkspace(const int& id) {
     for (auto& w : m_vWindows) {
-        if (w->m_iWorkspaceID == id)
+        if (w->m_iWorkspaceID == id && w->m_bIsMapped && !w->m_bHidden)
             return w.get();
     }