diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 5547ef607..a16585794 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -667,6 +667,7 @@ static void read_surface_class(struct wlr_xwm *xwm,
 	if (len > 0 && instance_len < len) {
 		surface->instance = strndup(class, instance_len);
 		class += instance_len + 1;
+		len -= instance_len + 1;
 	} else {
 		surface->instance = NULL;
 	}