diff --git a/tag.c b/tag.c
index 2363908..03c5f33 100644
--- a/tag.c
+++ b/tag.c
@@ -89,6 +89,7 @@ uicb_tagtransfert(uicb_t cmd)
           n = 1;
 
      sel->tag = n;
+     selbytag[n] = sel;
      arrange();
 
      return;
diff --git a/wmfs.c b/wmfs.c
index 01237b5..c4487c8 100644
--- a/wmfs.c
+++ b/wmfs.c
@@ -570,7 +570,7 @@ manage(Window w, XWindowAttributes *wa)
           c->tag = t->tag;
      if(!c->free)
           c->free = (rettrans == Success) || c->hint;
-     if(c->free)
+     else
           raiseclient(c);
 
      attach(c);