diff --git a/src/client.c b/src/client.c
index 1ba506b..81ba14a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -534,6 +534,10 @@ client_manage(Window w, XWindowAttributes *wa, Bool ar)
           for(t = clients; t && t->win != trans; t = t->next);
      if(t)
           c->tag = t->tag;
+     if(!(c->flags & FreeFlag))
+          if(rettrans == Success || (c->flags & HintFlag))
+               c->flags |= FreeFlag;
+
      free(t);
 
      client_attach(c);