diff --git a/client.c b/client.c
index adf422e..06bc9d8 100644
--- a/client.c
+++ b/client.c
@@ -216,8 +216,7 @@ manage(Window w, XWindowAttributes *wa) {
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
 	attachstack(c);
-	c->isbanned = True;
-	XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+	ban(c);
 	XMapWindow(dpy, w);
 	setclientstate(c, NormalState);
 	focus(c);
diff --git a/layout.c b/layout.c
index f3f8e26..0706c62 100644
--- a/layout.c
+++ b/layout.c
@@ -88,9 +88,7 @@ floating(void) {
 
 	for(c = clients; c; c = c->next)
 		if(isvisible(c)) {
-			if(c->isbanned)
-				XMoveWindow(dpy, c->win, c->x, c->y);
-			c->isbanned = False;
+			unban(c);
 			resize(c, c->x, c->y, c->w, c->h, True);
 		}
 		else
diff --git a/main.c b/main.c
index 032fafa..471cfc2 100644
--- a/main.c
+++ b/main.c
@@ -38,8 +38,7 @@ static void
 cleanup(void) {
 	close(STDIN_FILENO);
 	while(stack) {
-		if(stack->isbanned)
-			XMoveWindow(dpy, stack->win, stack->x, stack->y);
+		unban(stack);
 		unmanage(stack);
 	}
 	if(dc.font.set)