diff --git a/ChangeLog b/ChangeLog
index cb6c0a21f..ead3f8754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Source/NSWindow.m: ([setFrameFromString:]) try to adjust sensibly
 	for changes to screen size.
+	([constrainFrameRect:toScreen:]) bugfix for positioning when the
+	window origin is negative.
 
 2003-04-26  Fred Kiefer <FredKiefer@gmx.de>
 
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 0bcda2a8c..c4ddab784 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1625,10 +1625,14 @@ static NSNotificationCenter *nc = nil;
       if (difference > 0)
 	{
 	  frameRect.size.height -= difference;
+	  frameRect.origin.y += difference;
 	}
-      if (frameRect.size.height < _minimumSize.height)
+      /* Ensure that rewsizing doesn't makewindow smaller than minimum */
+      difference = _minimumSize.height - frameRect.size.height;
+      if (difference > 0)
 	{
-	  frameRect.size.height = _minimumSize.height;
+	  frameRect.size.height += difference;
+	  frameRect.origin.y -= difference;
 	}
     }