diff --git a/client.c b/client.c
index 2a5bede..bb8f8dc 100644
--- a/client.c
+++ b/client.c
@@ -839,6 +839,8 @@ client_getsizehints(struct client_ctx *cc)
 	}
 	cc->hint.incw = MAX(1, cc->hint.incw);
 	cc->hint.inch = MAX(1, cc->hint.inch);
+	cc->hint.minw = MAX(1, cc->hint.minw);
+	cc->hint.minh = MAX(1, cc->hint.minh);
 
 	if (size.flags & PAspect) {
 		if (size.min_aspect.x > 0)
diff --git a/kbfunc.c b/kbfunc.c
index 121ae7d..e5e0708 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -143,10 +143,10 @@ kbfunc_client_resize(struct client_ctx *cc, union arg *arg)
 
 	kbfunc_amount(arg->i, &mx, &my);
 
-	if ((cc->geom.w += mx) < 1)
-		cc->geom.w = 1;
-	if ((cc->geom.h += my) < 1)
-		cc->geom.h = 1;
+	if ((cc->geom.w += mx * cc->hint.incw) < cc->hint.minw)
+		cc->geom.w = cc->hint.minw;
+	if ((cc->geom.h += my * cc->hint.inch) < cc->hint.minh)
+		cc->geom.h = cc->hint.minh;
 	client_resize(cc, 1);
 
 	/* Make sure the pointer stays within the window. */