diff --git a/ChangeLog b/ChangeLog
index 7b5a8835f..bcf442200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-09  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSApplication (hide:): Don't setinputfocus to the
+	icon window.
+	* Source/NSWindow.m (-sendEvent:) (GSAppKitWindowFocusIn): 
+	If we're not visible, don't try to become main/key.
+
 2002-10-08  Adam Fedor  <fedor@gnu.org>
 
 	* Fix window focus problems.
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index fe485c74a..a6a869982 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -1676,8 +1676,6 @@ delegate.
 	{
 	  _hidden_key = [self keyWindow];
 	  [_hidden_key resignKeyWindow];
-	  [GSServerForWindow(_app_icon_window) 
-			    setinputfocus: [_app_icon_window windowNumber]];
 	}
       for (i = 0; i < count; i++)
 	{
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 7ad5c4211..76eb92ac3 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2975,6 +2975,12 @@ Code shared with [NSPanel -sendEvent:], remember to update both places.
 		  /* Window Manager just deminiaturized us */
 		  [self _didDeminiaturize: self];
 		}
+	      if (_f.visible == NO)
+		{
+		  NSDebugLLog(@"Focus", @"WM take focus on hidden window %d",
+			      _windowNum);
+		  break;
+		}
 	      if ([self canBecomeKeyWindow] == YES)
 		{
 		  [self makeKeyWindow];