diff --git a/ChangeLog b/ChangeLog
index 68f93284e..f392d54cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-27  Georg Fleischmann
+
+	* gui/Source/NSWindow.m
+	[NSWindow initWithContentRect:styleMask:backing:defer:screen:]:
+	constrain frame rect to screen
+
 2001-07-24 Gregory John Casamento <greg_casamento@yahoo.com>
         
         * Source/NSSpellChecker.m cleaned up some of the NSLog
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index f8eb7863f..75639a3ad 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -677,6 +677,7 @@ static NSMapTable* windowmaps = NULL;
   _styleMask = aStyle;
   
   _frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle];
+  _frame = [self constrainFrameRect: _frame toScreen: [self screen]];
   _minimumSize = NSMakeSize(_frame.size.width - contentRect.size.width + 1,
     _frame.size.height - contentRect.size.height + 1);
   _maximumSize = NSMakeSize (10e4, 10e4);