diff --git a/src/backend/wayland/wl_backend.c b/src/backend/wayland/wl_backend.c
index 68c3c49..6c04d94 100644
--- a/src/backend/wayland/wl_backend.c
+++ b/src/backend/wayland/wl_backend.c
@@ -246,6 +246,7 @@ struct wl_toplevel_view {
     struct wl_listener       request_minimize_listener;  /* Phase 16 */
     struct wl_listener       set_app_id_listener;        /* Phase 16 */
     struct wl_listener       commit_listener;            /* initial configure */
+    struct wl_listener       surface_commit_listener;  /* permanent commit listener */
     /* Phase 17: XWayland — set for X11 windows, NULL for XDG toplevels. */
     struct wlr_xwayland_surface *xw_surface;
     /* Path 1: geometry listener — keeps scene node in sync when X11 window moves. */
@@ -1173,6 +1174,7 @@ handle_toplevel_destroy(struct wl_listener *listener, void *data)
     wl_list_remove(&view->request_minimize_listener.link);
     wl_list_remove(&view->set_app_id_listener.link);
     wl_list_remove(&view->commit_listener.link);
+    wl_list_remove(&view->surface_commit_listener.link);
     wl_list_remove(&view->link);
     /* Phase 18: remove scene node. */
     if (view->scene_node) {
@@ -1664,6 +1666,16 @@ handle_xdg_toplevel_initial_commit(struct wl_listener *listener, void *data)
     wlr_xdg_surface_schedule_configure(view->xdg_surface);
 }
 
+static void
+handle_toplevel_commit(struct wl_listener *listener, void *data)
+{
+    struct wl_toplevel_view *view =
+        wl_container_of(listener, view, surface_commit_listener);
+    (void)view; (void)data;
+    if (wl_state.output)
+        wlr_output_schedule_frame(wl_state.output);
+}
+
 /*
  * Phase 36 / 38: new XDG toplevel listener (wlroots 0.19+).
  * Fires when the client calls get_toplevel on an xdg_surface.
@@ -1710,6 +1722,9 @@ handle_xdg_new_toplevel(struct wl_listener *listener, void *data)
     view->commit_listener.notify = handle_xdg_toplevel_initial_commit;
     wl_signal_add(&xdg_surface->surface->events.commit, &view->commit_listener);
 
+    view->surface_commit_listener.notify = handle_toplevel_commit;
+    wl_signal_add(&xdg_surface->surface->events.commit, &view->surface_commit_listener);
+
     wl_list_insert(&wl_state.toplevel_list, &view->link);
     wl_state.managed_surface_count++;