2 files changed, 6 insertions, 3 deletions
diff --git a/client.c b/client.c
index 269bf8c6..050e8a3b 100644
--- a/client.c
+++ b/client.c
@@ -261,6 +261,10 @@ manage(Window w, XWindowAttributes *wa)
 	if(trans && (tc = getclient(trans))) {
 		c->x = (tc->x + tc->w / 2) - (c->w / 2);
 		c->y = (tc->y + tc->h / 2) - (c->h / 2);
+		if(c->x < 0 || c->x >= sw)
+			c->x = (sw / 2) - (c->w / 2);
+		if(c->y < 0 || c->y >= sh)
+			c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
 	}
 	else {
 		c->x = (sw / 2) - (c->w / 2);
diff --git a/tag.c b/tag.c
index 841d0fc5..cdb0f524 100644
--- a/tag.c
+++ b/tag.c
@@ -49,12 +49,11 @@ dofloat(Arg *arg)
 	}
 	if(!sel || !isvisible(sel))
 		sel = getnext(clients);
-	if(sel) {
+	if(sel)
 		focus(sel);
-		restack();
-	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	restack();
 }
 
 void