diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c
index 4a6bf680b1..4ac423c2d5 100644
--- a/gdk/broadway/gdkdevice-broadway.c
+++ b/gdk/broadway/gdkdevice-broadway.c
@@ -172,9 +172,9 @@ gdk_broadway_device_query_state (GdkDevice        *device,
   if (root_y)
     *root_y = device_root_y;
   if (win_x)
-    *win_x = device_root_x - toplevel->x;
+    *win_x = device_root_x;
   if (win_y)
-    *win_y = device_root_y - toplevel->y;
+    *win_y = device_root_y;
   if (mask)
     *mask = mask32;
   if (child_window)
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 0967ffe611..17075bb86b 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -724,7 +724,7 @@ gdk_window_broadway_get_device_state (GdkWindow       *window,
     return FALSE;
 
   GDK_DEVICE_GET_CLASS (device)->query_state (device, window,
-                                              NULL, &child,
+                                              &child,
                                               NULL, NULL,
                                               x, y, mask);
   return child != NULL;