diff --git a/src/core/window.c b/src/core/window.c
index 76571f4c8..dc05ce841 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -46,6 +46,7 @@
 #include "input-events.h"
 #include "mutter-enum-types.h"
 #include "core.h"
+#include "device-pointer.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlibint.h> /* For display->resource_mask */
@@ -9606,11 +9607,8 @@ warp_grab_pointer (MetaWindow          *window,
   meta_window_get_client_root_coords (window,
                                       &grab_info->grab_anchor_window_pos);
 
-  XWarpPointer (display->xdisplay,
-                None,
-                window->screen->xroot,
-                0, 0, 0, 0,
-                *x, *y);
+  meta_device_pointer_warp (META_DEVICE_POINTER (grab_info->grab_pointer),
+                            window->screen, *x, *y);
 
   if (meta_error_trap_pop_with_return (display) != Success)
     {