diff --git a/patch/setborderpx.c b/patch/setborderpx.c
index fd4877d..be34b2d 100644
--- a/patch/setborderpx.c
+++ b/patch/setborderpx.c
@@ -17,11 +17,12 @@ setborderpx(const Arg *arg)
 			c->bw = selmon->borderpx = 0;
 		else
 			c->bw = selmon->borderpx;
-
 		if (c->isfloating || !selmon->lt[selmon->sellt]->arrange)
 		{
-			if (arg->i != 0)
+			if (arg->i != 0 && prev_borderpx + arg->i >= 0)
 				resize(c, c->x, c->y, c->w-(arg->i*2), c->h-(arg->i*2), 0);
+			else if (arg->i != 0)
+				resizeclient(c, c->x, c->y, c->w, c->h);
 			else if (prev_borderpx > borderpx)
 				resize(c, c->x, c->y, c->w + 2*(prev_borderpx - borderpx), c->h + 2*(prev_borderpx - borderpx), 0);
 			else if (prev_borderpx < borderpx)
@@ -29,4 +30,4 @@ setborderpx(const Arg *arg)
 		}
 	}
 	arrange(selmon);
-}
\ No newline at end of file
+}