diff --git a/src/client.c b/src/client.c
index 8f69017..7ed498d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1297,13 +1297,19 @@ client_unmanage(Client *c)
      {
           /* Arrange */
           for(i = 0; i < screen_count() && !b; ++i)
-               if(c->tag == (uint)seltag[i] || tags[i][seltag[i]].tagad & TagFlag(c->tag))
+               if(c->tag == (uint)seltag[i])
+               {
                     b = True;
+                    break;
+               }
+               else if(tags[i][seltag[i]].tagad & TagFlag(c->tag))
+               {
+                    tags[i][seltag[i]].layout.func(c->screen);
+                    break;
+               }
 
           if(b)
-          {
                tags[c->screen][c->tag].layout.func(c->screen);
-          }
           else
           {
                tags[c->screen][c->tag].request_update = True;