1 files changed, 4 insertions, 0 deletions
diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index ff4b147f..fa080dd7 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -383,6 +383,10 @@ void Events::listener_unmapWindow(void* owner, void* data) {
     // refocus on a new window
     g_pInputManager->refocus();
 
+    if (!g_pCompositor->m_pLastWindow) {
+        g_pCompositor->focusWindow(g_pCompositor->getFirstWindowOnWorkspace(PWORKSPACE->m_iID));
+    }
+
     Debug::log(LOG, "Destroying the SubSurface tree of unmapped window %x", PWINDOW);
     SubsurfaceTree::destroySurfaceTree(PWINDOW->m_pSurfaceTree);