diff --git a/client.c b/client.c
index bd7b33c45..b21e6a0d0 100644
--- a/client.c
+++ b/client.c
@@ -838,6 +838,11 @@ client_unmanage(client_t *c)
 {
     tag_array_t *tags = &globalconf.screens[c->screen].tags;
 
+    /* Reset transient_for attributes of widows that maybe refering to us */
+    for(client_t *tc = globalconf.clients; tc; tc = tc->next)
+        if(tc->transient_for == c)
+            tc->transient_for = NULL;
+
     if(globalconf.screens[c->phys_screen].client_focus == c)
         client_unfocus(c);