diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 04c1decdfb..bdff204913 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9885,7 +9885,10 @@ update_cursor (GtkWindow *toplevel,
       /* Outside the grab widget, cursor stays to whatever the grab
        * widget says.
        */
-      cursor = gtk_widget_get_cursor (grab_widget);
+      if (gtk_widget_get_surface (grab_widget) == gtk_widget_get_surface (target))
+        cursor = gtk_widget_get_cursor (grab_widget);
+      else
+        cursor = NULL;
     }
   else
     {