diff --git a/client.c b/client.c
index e957597..d9ff7e8 100644
--- a/client.c
+++ b/client.c
@@ -91,7 +91,6 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	cc->geom.y = wattr.y;
 	cc->geom.width = wattr.width;
 	cc->geom.height = wattr.height;
-	cc->geom.height = wattr.height;
 	cc->cmap = wattr.colormap;
 
 	if (wattr.map_state != IsViewable) {
@@ -808,12 +807,16 @@ client_placecalc(struct client_ctx *cc)
 	if (cc->size->flags & USPosition) {
 		if (cc->size->x > 0)
 			x = cc->size->x;
-		if (x <= 0 || x >= xmax)
+		if (x < cc->bwidth)
 			x = cc->bwidth;
+		else if (x > xslack)
+			x = xslack;
 		if (cc->size->y > 0)
 			y = cc->size->y;
-		if (y <= 0 || y >= ymax)
+		if (y < cc->bwidth)
 			y = cc->bwidth;
+		else if (y > yslack)
+			y = yslack;
 	} else {
 		if (yslack < 0) {
 			y = cc->bwidth;