diff --git a/ChangeLog b/ChangeLog
index c7b78473e..c69c5db7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-01  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (constrain_position): always align fullscreen
+	windows to top, as we do with maximized windows.
+
 2002-10-01  Stanislav Brabec  <sbrabec@suse.cz>
 
 	* configure.in: Added cs to ALL_LINGUAS.
diff --git a/src/window.c b/src/window.c
index 8e301a1d0..64b8ee2b7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5686,15 +5686,12 @@ constrain_position (MetaWindow        *window,
        * the screen area.
        */
       x += (xinerama->width - window->rect.width) / 2;
-      y += (xinerama->height - window->rect.height) / 2;
 
       /* If the window is somehow larger than the screen be paranoid
        * and fix the resulting negative coords
        */
       if (x < xinerama->x_origin)
         x = xinerama->x_origin;
-      if (y < xinerama->y_origin)
-        y = xinerama->y_origin;      
     }
   else if (window->maximized)
     {