diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index fa7c18ee5..4adfeb197 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -781,8 +781,8 @@ xdg_surface_show_window_menu (struct wl_client *client,
                               struct wl_resource *resource,
                               struct wl_resource *seat_resource,
                               uint32_t serial,
-                              uint32_t x,
-                              uint32_t y)
+                              int32_t x,
+                              int32_t y)
 {
   MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
   MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
diff --git a/src/wayland/protocol/xdg-shell.xml b/src/wayland/protocol/xdg-shell.xml
index 6d6b52f75..0327f40ab 100644
--- a/src/wayland/protocol/xdg-shell.xml
+++ b/src/wayland/protocol/xdg-shell.xml
@@ -204,14 +204,18 @@
         a context menu when right-clicking on the decorations, giving the
         user a menu that they can use to maximize or minimize the window.
 
-        The seat passed must have either pointer or keyboard focus to pop
-        up the window menu for a surface.
+        This request asks the compositor to pop up such a window menu at
+        the given position, relative to the parent surface. There are
+        no guarantees as to what the window menu contains.
+
+        Your surface must have focus on the seat passed in to pop up the
+        window menu.
       </description>
 
       <arg name="seat" type="object" interface="wl_seat" summary="the seat to pop the window up on"/>
       <arg name="serial" type="uint" summary="serial of the event to pop up the window for"/>
-      <arg name="x" type="uint"/>
-      <arg name="y" type="uint"/>
+      <arg name="x" type="int" summary="the x position to pop up the window menu at"/>
+      <arg name="y" type="int" summary="the y position to pop up the window menu at"/>
     </request>
 
     <request name="move">