diff --git a/src/core/display-private.h b/src/core/display-private.h
index 0fc0fb697..e9410dfad 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -371,7 +371,6 @@ Cursor         meta_display_create_x_cursor (MetaDisplay *display,
 void     meta_display_set_grab_op_cursor (MetaDisplay *display,
                                           MetaScreen  *screen,
                                           MetaGrabOp   op,
-                                          Window       grab_xwindow,
                                           guint32      timestamp);
 
 void    meta_display_check_threshold_reached (MetaDisplay *display,
diff --git a/src/core/display.c b/src/core/display.c
index 543815a99..3c3ee0b88 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1726,7 +1726,6 @@ void
 meta_display_set_grab_op_cursor (MetaDisplay *display,
                                  MetaScreen  *screen,
                                  MetaGrabOp   op,
-                                 Window       grab_xwindow,
                                  guint32      timestamp)
 {
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
@@ -1746,7 +1745,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
   meta_error_trap_push (display);
   if (XIGrabDevice (display->xdisplay,
                     META_VIRTUAL_CORE_POINTER_ID,
-                    grab_xwindow,
+                    display->grab_xwindow,
                     timestamp,
                     meta_display_create_x_cursor (display, cursor),
                     XIGrabModeAsync, XIGrabModeAsync,
@@ -1764,7 +1763,6 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
                   "XIGrabDevice() failed time %u\n",
                   timestamp);
     }
-
   meta_error_trap_pop (display);
 
   cursor_ref = meta_cursor_reference_from_theme (cursor);
@@ -1840,8 +1838,9 @@ meta_display_begin_grab_op (MetaDisplay *display,
 
   if (pointer_already_grabbed)
     display->grab_have_pointer = TRUE;
-  
-  meta_display_set_grab_op_cursor (display, screen, op, grab_xwindow, timestamp);
+
+  display->grab_xwindow = grab_xwindow;
+  meta_display_set_grab_op_cursor (display, screen, op, timestamp);
 
   if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op))
     {
@@ -1873,7 +1872,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
   
   display->grab_op = op;
   display->grab_window = grab_window;
-  display->grab_xwindow = grab_xwindow;
   display->grab_button = button;
   if (window)
     {
diff --git a/src/core/window.c b/src/core/window.c
index 334477378..2f2d45937 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8104,7 +8104,6 @@ meta_window_update_keyboard_resize (MetaWindow *window,
       meta_display_set_grab_op_cursor (window->display,
                                        window->screen,
                                        window->display->grab_op,
-                                       window->display->grab_xwindow,
                                        window->display->grab_timestamp);
     }
 }