diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 282ecd25d..53c04d5f7 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -270,6 +270,17 @@ adjust_for_gravity (MetaWindow        *window,
   int frame_width, frame_height;
   MetaFrameBorders borders;
 
+  /* We're computing position to pass to window_move, which is
+   * the position of the client window (StaticGravity basically)
+   *
+   * (see WM spec description of gravity computation, but note that
+   * their formulas assume we're honoring the border width, rather
+   * than compensating for having turned it off)
+   */
+
+  if (gravity == StaticGravity)
+    return;
+
   if (coords_assume_border)
     bw = priv->border_width;
   else
@@ -282,14 +293,6 @@ adjust_for_gravity (MetaWindow        *window,
   frame_width = child_x + rect->width + borders.visible.right;
   frame_height = child_y + rect->height + borders.visible.bottom;
 
-  /* We're computing position to pass to window_move, which is
-   * the position of the client window (StaticGravity basically)
-   *
-   * (see WM spec description of gravity computation, but note that
-   * their formulas assume we're honoring the border width, rather
-   * than compensating for having turned it off)
-   */
-
   /* Calculate the the reference point, which is the corner of the
    * outer window specified by the gravity. So, NorthEastGravity
    * would have the reference point as the top-right corner of the