diff --git a/ChangeLog b/ChangeLog
index cad12db57..6a49c1507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-06  Arvind Samptur <arvind.samptur@wipro.com>
+	* src/window.c: (constrain_position) don't apply
+	offscreen height difference. This would get the
+	window under the panel on a resize or a move.
+	Fixes #102418
+
 2003-01-05  Havoc Pennington  <hp@pobox.com>
 
 	* src/screen.c (meta_screen_calc_workspace_layout): invert
diff --git a/src/window.c b/src/window.c
index 78e782596..8c4c626cf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5873,8 +5873,6 @@ constrain_position (MetaWindow        *window,
       /* Now change NW limit to reflect amount offscreen in SE direction */
       if (offscreen_w > 0)
         nw_x -= offscreen_w;
-      if (offscreen_h > 0)
-        nw_y -= offscreen_h;
       
       /* Limit movement off the right/bottom.
        * Remember, we're constraining StaticGravity position.