diff --git a/ChangeLog b/ChangeLog
index 11a4ad5cb..21dd2c117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-21  Havoc Pennington  <hp@redhat.com>
+
+	* src/window.c (constrain_position): fix positioning in fullscreen
+	mode, patch from Gustavo Giráldez
+
 2002-05-20  Alessio Frusciante  <algol@firenze.linux.it>
 
 	* configure.in: Added Italian to ALL_LINGUAS. 
diff --git a/src/window.c b/src/window.c
index 9e16f4476..a4601d6a8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5043,11 +5043,9 @@ constrain_position (MetaWindow *window,
        * prevents fullscreen, center the window within
        * the screen area.
        */
-      x += (window->screen->width - window->rect.width -
-            (window->frame ? (fgeom->left_width + fgeom->right_width) : 0)) / 2;
+      x += (window->screen->width - window->rect.width) / 2;
 
-      y += (window->screen->height - window->rect.height -
-            (window->frame ? (fgeom->top_height + fgeom->bottom_height) : 0)) / 2;
+      y += (window->screen->height - window->rect.height) / 2;
     }
   else if (window->maximized)
     {