1 files changed, 1 insertions, 2 deletions
diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index e95b3c3b..9b58d0f5 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -400,14 +400,13 @@ void Events::listener_mapWindow(void* owner, void* data) {
 
                 if (w->getPID() == ppid) {
                     found.push_back(w.get());
-                    break;
                 }
             }
 
             if (found.size() > 1) {
                 for (auto& w : found) {
                     // try get the focus
-                    if (w == g_pCompositor->m_pLastWindow) {
+                    if (w == PFOCUSEDWINDOWPREV) {
                         finalFound = w;
                         break;
                     }