diff --git a/src/core/window.c b/src/core/window.c
index a3ba38575..cf5cd7daa 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4983,6 +4983,11 @@ meta_window_move_resize_internal (MetaWindow          *window,
                          &old_rect,
                          &new_rect);
 
+  /* meta_window_constrain() might have maximized the window after placement,
+   * changing the borders.
+   */
+  meta_frame_calc_borders (window->frame, &borders);
+
   w = new_rect.width;
   h = new_rect.height;
   root_x_nw = new_rect.x;