diff --git a/ChangeLog b/ChangeLog
index a2f4153ee..a647a9d26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-08  Rob Adams  <readams@readams.net>
+
+	* src/window.c (meta_window_move_resize_internal): configure frame
+	first if we grow more than we shrink combined in both dimensions.
+	Patch from Soren Sandmann for #108925.
+
 2003-11-07  Rob Adams  <readams@readams.net>
 
 	* src/place.c (meta_window_place): use maximize_after_placement to
diff --git a/src/window.c b/src/window.c
index 035734bf8..1a0163021 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2272,6 +2272,8 @@ meta_window_move_resize_internal (MetaWindow  *window,
   gboolean need_resize_frame = FALSE;
   int frame_size_dx;
   int frame_size_dy;
+  int size_dx;
+  int size_dy;
   gboolean is_configure_request;
   gboolean do_gravity_adjust;
   gboolean is_user_action;
@@ -2529,21 +2531,13 @@ meta_window_move_resize_internal (MetaWindow  *window,
   /* The rest of this function syncs our new size/pos with X as
    * efficiently as possible
    */
-  if (use_static_gravity)
-    {
-      int size_dx = w - window->rect.width;
-      int size_dy = h - window->rect.height;
-      
-      if ((size_dx + size_dy) >= 0)
-        configure_frame_first = FALSE;
-      else
-        configure_frame_first = TRUE;
-    }
-  else
-    {
-      configure_frame_first = FALSE;
-    }
 
+  /* configure frame first if we grow more than we shrink
+   */
+  size_dx = w - window->rect.width;
+  size_dy = h - window->rect.height;
+
+  configure_frame_first = (size_dx + size_dy >= 0);
 
   if (use_static_gravity)
     meta_window_set_gravity (window, StaticGravity);