diff --git a/ChangeLog b/ChangeLog
index 4ce57bc6a..79e14d32f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-09 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSWindow.m (-makeKeyAndOrderFront:): Use
+	orderFrontRegardless instead of orderFront:.
+	Patch by Yen-Ju Chen <yjchenx@gmail.com>
+
 2007-09-09 Fred Kiefer <FredKiefer@gmx.de>
 	
 	* Headers/AppKit/NSTextField.h:
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 6ecd89487..101481c0d 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1498,7 +1498,7 @@ many times.
 
 - (void) makeKeyAndOrderFront: (id)sender
 {
-  [self orderFront: sender];
+  [self orderFrontRegardless];
   [self makeKeyWindow];
   /*
    * OPENSTEP makes a window the main window when it makes it the key window.