diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 57a87795..7c8b1ef8 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -240,10 +240,8 @@ void CCompositor::cleanup() {
 
     // accumulate all PIDs for killing, also request closing.
     for (auto& w : m_vWindows) {
-        if (w->m_bIsMapped || !w->m_bIsX11)
+        if (w->m_bIsMapped && !w->m_bHidden)
             m_dProcessPIDsOnShutdown.push_back(w->getPID());
-
-        closeWindow(w.get());
     }
 
     // end threads