1 files changed, 6 insertions, 0 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index ed044fc8..eb2c9f92 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -144,6 +144,9 @@ void CCompositor::cleanupExit() {
     if (!m_sWLDisplay)
         return;
 
+    m_pLastFocus = nullptr;
+    m_pLastWindow = nullptr;
+
     m_lWorkspaces.clear();
     m_lWindows.clear();
 
@@ -620,6 +623,9 @@ bool CCompositor::doesSeatAcceptInput(wlr_surface* surface) {
 }
 
 bool CCompositor::isWindowActive(CWindow* pWindow) {
+    if (!m_pLastWindow && !m_pLastFocus)
+        return false;
+
     if (!windowValidMapped(pWindow))
         return false;