diff --git a/ChangeLog b/ChangeLog
index b631bc222..00dc821d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2003-03-07  Richard Frith-Macdonald <rfm@gnu.org>
 
-	* Source/NSMenu.m: ([_updateUserDefaults:]) restore saved menu
+	* Source/NSMenu.m: ([-_updateUserDefaults:]) restore saved menu
 	location functionality (was only working for torn off menus).
+	* Source/NSWindow: ([-miniaturise:]) order the counterpart window
+	in so that it gets drawn properly.
 
 2003-03-06  Willem Rein Oudshoorn  <woudshoo@xs4all.nl>
 
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index fd9c46dda..57bd3a1ba 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -94,8 +94,8 @@ _NSAppKitUncaughtExceptionHandler (NSException *exception)
    * its a sever error, use a non-graphical exception handler
    */
   if (GSCurrentContext() == nil
-      || [[exception name] isEqual: NSWindowServerCommunicationException]
-      || [[exception name] isEqual: GSWindowServerInternalException])
+    || [[exception name] isEqual: NSWindowServerCommunicationException]
+    || [[exception name] isEqual: GSWindowServerInternalException])
     {
       /* The following will raise again the exception using the base 
 	 library exception handler */
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 41c8966f7..9f917321c 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2262,6 +2262,17 @@ resetCursorRectsForView(NSView *theView)
   [srv miniwindow: _windowNum];
   _f.visible = NO;
   
+  /*
+   * We must order the miniwindow in so that we will start sending
+   * it -_handleWindowNeedsDisplay: messages to tell it to display
+   * itsself when neccessary.
+   */
+  if (_counterpart != 0)
+    {
+      NSWindow	*mini = GSWindowWithNumber(_counterpart);
+
+      [mini orderFront: self];
+    }
   [nc postNotificationName: NSWindowDidMiniaturizeNotification
 		    object: self];
 }