1 files changed, 4 insertions, 0 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 7fa45b07..66306888 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -893,6 +893,10 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) {
     g_pLayoutManager->getCurrentLayout()->bringWindowToTop(pWindow);
 
     if (!pWindow || !windowValidMapped(pWindow)) {
+
+        if (!m_pLastWindow && !pWindow)
+            return;
+
         const auto PLASTWINDOW = m_pLastWindow;
         m_pLastWindow          = nullptr;