diff --git a/ChangeLog b/ChangeLog
index f35ad1b47..4fc53adcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-31  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSWindow.m (-becomeKeyWindow): Set initialFirstResponder.
+	(-display): Remove this code from here.
+
 2003-03-31  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSButtonCell.m, Source/NSCell.m, Source/NSMenuItem.m:
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index bff2e2739..844142df4 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1181,6 +1181,14 @@ static NSNotificationCenter *nc = nil;
     {
       _f.is_key = YES;
 
+      if ((!_firstResponder) || (_firstResponder == self))
+	{
+	  if (_initialFirstResponder)
+	    {
+	      [self makeFirstResponder: _initialFirstResponder];
+	    }
+	}
+
       [_firstResponder becomeFirstResponder];
       if ((_firstResponder != self)
 	  && [_firstResponder respondsToSelector: @selector(becomeKeyWindow)])
@@ -1795,20 +1803,7 @@ static NSNotificationCenter *nc = nil;
     return;
 
   _rFlags.needs_display = NO;
-  // FIXME: Is the first responder processing needed here?
-  if ((!_firstResponder) || (_firstResponder == self))
-    {
-      if (_initialFirstResponder)
-	{
-	  [self makeFirstResponder: _initialFirstResponder];
-	}
-    }
   
-  /*
-   * inform first responder of it's status so it can set the focus to itself
-   */
-  [_firstResponder becomeFirstResponder];
-
   [_wv display];
   [self discardCachedImage];
 }