diff --git a/ChangeLog b/ChangeLog
index 7a0cc5d62..d8db9f20d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-25  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSWindow.m (-orderWindow:relativeTo:): In OrderOut case
+	cancle _handleWindowNeedsDisplay unconditional. (-close): Don't
+	cancle _handleWindowNeedsDisplay as this gets done by the
+	following [orderOut:] call. These changes adopt to a previous
+	change in [_handeWindowNeedsDisplay:] to always resend itself.
+
 2004-01-25 04:15  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/NSLayoutManager.m (-invalidateDisplayForCharacterRange:,
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 2a9b4c611..4bc11ad5a 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1428,16 +1428,13 @@ many times.
   if (place == NSWindowOut)
     {
       _f.visible = NO;
-      if (_rFlags.needs_display == YES)
-	{
-	  /*
-	   * Don't keep trying to update the window while it is ordered out
-	   */
-	  [[NSRunLoop currentRunLoop]
-             cancelPerformSelector: @selector(_handleWindowNeedsDisplay:)
-                            target: self
-                          argument: nil];
-	}
+      /*
+       * Don't keep trying to update the window while it is ordered out
+       */
+      [[NSRunLoop currentRunLoop]
+	  cancelPerformSelector: @selector(_handleWindowNeedsDisplay:)
+	  target: self
+	  argument: nil];
       [self _lossOfKeyOrMainWindow];
     }
   else
@@ -2240,10 +2237,6 @@ resetCursorRectsForView(NSView *theView)
 
       [nc postNotificationName: NSWindowWillCloseNotification object: self];
       _f.has_opened = NO;
-      [[NSRunLoop currentRunLoop]
-	cancelPerformSelector: @selector(_handleWindowNeedsDisplay:)
-	target: self
-	argument: nil];
       [NSApp removeWindowsItem: self];
       [self orderOut: self];