diff --git a/ChangeLog b/ChangeLog
index 9b76b5296..c8df22e17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-20  Elijah Newren  <newren@gmail.com>
+
+	* src/constraints.c (place_window_if_needed): compute the frame
+	geometry due to maximization only after actually maximizing.
+	Fixes #321902.
+
 2005-11-21  Davyd Madeley  <davyd@fugro-fsi.com.au>
 
 	* src/edge-resistance.c (meta_display_compute_resistance_and_snap):
diff --git a/src/constraints.c b/src/constraints.c
index 4e8802808..51941aa33 100644
--- a/src/constraints.c
+++ b/src/constraints.c
@@ -471,10 +471,6 @@ place_window_if_needed(MetaWindow     *window,
                    .083 * info->work_area_xinerama.height;
         }
 
-      /* maximization may have changed frame geometry */
-      if (window->frame && !window->fullscreen)
-        meta_frame_calc_geometry (window->frame, info->fgeom);
-
       if (window->maximize_horizontally_after_placement &&
           window->maximize_vertically_after_placement)
         meta_window_maximize_internal (window,   
@@ -496,6 +492,10 @@ place_window_if_needed(MetaWindow     *window,
             - info->fgeom->top_height - info->fgeom->bottom_height;
         }
 
+      /* maximization may have changed frame geometry */
+      if (window->frame && !window->fullscreen)
+        meta_frame_calc_geometry (window->frame, info->fgeom);
+
       window->maximize_horizontally_after_placement = FALSE;
       window->maximize_vertically_after_placement = FALSE;
     }