1 files changed, 8 insertions, 1 deletions

diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index d1aec084..95275937 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -8,6 +8,7 @@
 #include "log.h"
 #include "sway/desktop.h"
 #include "sway/desktop/transaction.h"
+#include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/output.h"
@@ -390,6 +391,11 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
         wl_list_remove(&xwayland_view->commit.link);
 }
 
+static void do_rebase(void *data) {
+        struct sway_cursor *cursor = data;
+        cursor_rebase(cursor);
+}
+
 static void handle_map(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, map);
@@ -416,7 +422,8 @@ static void handle_map(struct wl_listener *listener, void *data) {
         // Put it back into the tree
         view_map(view, xsurface->surface, xsurface->fullscreen, false);
 
-        transaction_commit_dirty();
+        struct sway_seat *seat = input_manager_current_seat();
+        transaction_commit_dirty_with_callback(do_rebase, seat->cursor);
 }
 
 static void handle_request_configure(struct wl_listener *listener, void *data) {