diff --git a/src/core/constraints.c b/src/core/constraints.c
index 250de4159..f9b5668a9 100644
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -411,6 +411,9 @@ setup_constraint_info (ConstraintInfo      *info,
    * if there are no struts making the workarea smaller than
    * the monitor.
    */
+
+  meta_window_frame_rect_to_client_rect (window, new, new);
+
   if (meta_prefs_get_force_fullscreen() &&
       window->client_type != META_WINDOW_CLIENT_TYPE_WAYLAND &&
       !window->hide_titlebar_when_maximized &&
@@ -429,6 +432,8 @@ setup_constraint_info (ConstraintInfo      *info,
       meta_window_make_fullscreen_internal (window);
     }
 
+  meta_window_client_rect_to_frame_rect (window, new, new);
+
   /* Log all this information for debugging */
   meta_topic (META_DEBUG_GEOMETRY,
               "Setting up constraint info:\n"