diff --git a/ChangeLog b/ChangeLog
index 07098b9aa..7458230c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-02 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSWindow.m (-deminiaturize:, -miniaturize:): Try to
+	handle the case better, where GNUstep manages the mini window and
+	the window decoration itself.
+	Based on patch by Stefan Bidigaray <stefanbidi@gmail.com>.
+
 2007-10-02 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSPopUpButtonCell.m (-cellSize): Don't return zero size,
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 09ca3032b..da2da6196 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2631,7 +2631,6 @@ resetCursorRectsForView(NSView *theView)
   if (!_f.is_miniaturized)
     return;
 
-#if 0
   /* At least with X-Windows, the counterpart is tied to us, so it will
      automatically be ordered out when we are deminiaturized */
   if (_counterpart != 0)
@@ -2640,7 +2639,7 @@ resetCursorRectsForView(NSView *theView)
 
       [mini orderOut: self];
     }
-#endif
+
   _f.is_miniaturized = NO;
   [self makeKeyAndOrderFront: self];
   [self _didDeminiaturize: sender];
@@ -2722,6 +2721,8 @@ resetCursorRectsForView(NSView *theView)
       NSWindow *mini = GSWindowWithNumber(_counterpart);
 
       [mini orderFront: self];
+      // If the window is still visible, order it out.
+      [self orderOut: self];
     }
   [nc postNotificationName: NSWindowDidMiniaturizeNotification
                     object: self];