diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h
index dd25ea35..20fa7727 100644
--- a/include/libweston/libweston.h
+++ b/include/libweston/libweston.h
@@ -1740,6 +1740,8 @@ enum weston_surface_status {
 	/** buffer parameters have changed in a way which impacts the
 	 * processing pipeline, e.g. format/opacity */
 	WESTON_SURFACE_DIRTY_BUFFER_PARAMS = 1 << 3,
+	/** input region has changed */
+	WESTON_SURFACE_DIRTY_INPUT = 1 << 4,
 };
 
 struct weston_surface_state {
diff --git a/libweston/compositor.c b/libweston/compositor.c
index 51f8e86c..87b65a7e 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -3880,6 +3880,8 @@ surface_set_input_region(struct wl_client *client,
 		pixman_region32_fini(&surface->pending.input);
 		region_init_infinite(&surface->pending.input);
 	}
+
+	surface->pending.status |= WESTON_SURFACE_DIRTY_INPUT;
 }
 
 /* Cause damage to this sub-surface and all its children.
@@ -4199,8 +4201,11 @@ weston_surface_commit_state(struct weston_surface *surface,
 	}
 
 	/* wl_surface.set_input_region */
-	pixman_region32_intersect_rect(&surface->input, &state->input,
-				       0, 0, surface->width, surface->height);
+	if (status & (WESTON_SURFACE_DIRTY_SIZE | WESTON_SURFACE_DIRTY_INPUT)) {
+		pixman_region32_intersect_rect(&surface->input, &state->input,
+				       	       0, 0,
+					       surface->width, surface->height);
+	}
 
 	/* wl_surface.frame */
 	wl_list_insert_list(&surface->frame_callback_list,