diff --git a/src/client/client.h b/src/client/client.h
index e951910..2174c6f 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -325,13 +325,15 @@ static inline uint32_t client_set_size(Client *c, uint32_t width,
 
 		struct wlr_surface_state *state =
 			&c->surface.xwayland->surface->current;
-		struct wlr_box new_geo = {0};
-		new_geo.width = state->width;
-		new_geo.height = state->height;
-		if (c->geom.width - 2 * c->bw == new_geo.width &&
-			c->geom.height - 2 * c->bw == new_geo.height &&
-			c->surface.xwayland->x == c->geom.x + c->bw &&
-			c->surface.xwayland->y == c->geom.y + c->bw) {
+
+		if ((int32_t)c->geom.width - 2 * (int32_t)c->bw ==
+				(int32_t)state->width &&
+			(int32_t)c->geom.height - 2 * (int32_t)c->bw ==
+				(int32_t)state->height &&
+			(int32_t)c->surface.xwayland->x ==
+				(int32_t)c->geom.x + (int32_t)c->bw &&
+			(int32_t)c->surface.xwayland->y ==
+				(int32_t)c->geom.y + (int32_t)c->bw) {
 			c->configure_serial = 0;
 			return 0;
 		}
diff --git a/src/mango.c b/src/mango.c
index cbdc53a..540395a 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -6285,13 +6285,14 @@ void createnotifyx11(struct wl_listener *listener, void *data) {
 void commitx11(struct wl_listener *listener, void *data) {
 	Client *c = wl_container_of(listener, c, commmitx11);
 	struct wlr_surface_state *state = &c->surface.xwayland->surface->current;
-	struct wlr_box new_geo = {0};
-	new_geo.width = state->width;
-	new_geo.height = state->height;
-	if (c->geom.width - 2 * c->bw == new_geo.width &&
-		c->geom.height - 2 * c->bw == new_geo.height &&
-		c->surface.xwayland->x == c->geom.x + c->bw &&
-		c->surface.xwayland->y == c->geom.y + c->bw) {
+
+	if ((int32_t)c->geom.width - 2 * (int32_t)c->bw == (int32_t)state->width &&
+		(int32_t)c->geom.height - 2 * (int32_t)c->bw ==
+			(int32_t)state->height &&
+		(int32_t)c->surface.xwayland->x ==
+			(int32_t)c->geom.x + (int32_t)c->bw &&
+		(int32_t)c->surface.xwayland->y ==
+			(int32_t)c->geom.y + (int32_t)c->bw) {
 		c->configure_serial = 0;
 	}
 }