diff --git a/ChangeLog b/ChangeLog
index 35dcda05b..f4c0d4d27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-30  Rob Adams  <robadams@ucla.edu>
+
+	* src/window.c (meta_window_move_resize_internal): When passing
+	frame geometry to meta_window_constrain, send null if no frame.
+	Possible fix for #109039.
+
 2003-03-29  Havoc Pennington  <hp@pobox.com>
 
 	* src/wm-tester/test-gravity.c (main): add --noframes option for
diff --git a/src/window.c b/src/window.c
index 72f59743f..94ddb295a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2253,7 +2253,7 @@ meta_window_move_resize_internal (MetaWindow  *window,
                                &x_delta, &y_delta);
   
   meta_window_constrain (window,
-                         &fgeom,
+                         window->frame ? &fgeom : NULL,
                          &old_rect,
                          root_x_nw - old_rect.x,
                          root_y_nw - old_rect.y,