diff --git a/src/client.c b/src/client.c
index 2a9f466..81ec5dd 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1121,7 +1121,7 @@ client_unmanage(Client *c)
 
      /* Arrange */
      for(i = 0; i < screen_count() && !b; ++i)
-          if(c->tag == seltag[i])
+          if(c->tag == seltag[i] || tags[i][seltag[i]].tagad & TagFlag(c->tag))
                b = True;
 
      if(b)