diff --git a/libtaskmanager/xwindowtasksmodel.cpp b/libtaskmanager/xwindowtasksmodel.cpp
--- a/libtaskmanager/xwindowtasksmodel.cpp
+++ b/libtaskmanager/xwindowtasksmodel.cpp
@@ -314,8 +314,8 @@
                 i.next();
 
                 if (i.value() == window) {
-                    i.remove();
                     oldLeader = i.key();
+                    i.remove();
                 }
             }