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