--- ../core/gui/Source/NSFontPanel.m	Mon Apr 23 01:01:23 2001
+++ ../core.patch/gui/Source/NSFontPanel.m	Thu Jun 14 15:58:20 2001
@@ -69,6 +69,8 @@
 }
 
 
+NSText *sizeFieldText = nil;
+
 /* Implemented in NSBrowser */
 @interface GSBrowserTitleCell : NSTextFieldCell
 @end
@@ -328,6 +330,28 @@
   return self;
 }
 
+/*
+ *  Overriding fieldEditor: forObject:
+ */
+- (NSText *) fieldEditor:(BOOL) createFlag
+	       forObject:(id) anObject
+{
+  if ( ([anObject respondsToSelector: @selector(tag)])
+      && ([anObject tag] == NSFPSizeField))
+    {
+      if ((sizeFieldText == nil) && createFlag)
+        {
+          sizeFieldText = [NSText new];
+          [sizeFieldText setUsesFontPanel: NO];
+          [sizeFieldText setFieldEditor: YES];
+        }
+      return sizeFieldText;
+    }
+
+  return [super fieldEditor: createFlag
+		forObject: anObject];
+}
+
 @end
 
 @implementation NSFontPanel (Privat)
@@ -373,7 +397,7 @@
   self = [super initWithContentRect: contentRect 
 			  styleMask: style
 			    backing: NSBackingStoreRetained
-			      defer: NO
+			      defer: YES
 			     screen: nil];
   [self setTitle: @"Font Panel"];
 
@@ -541,6 +565,16 @@
   //[self setDefaultButtonCell: [setButton cell]];
   RELEASE(setButton);
 
+  // set the nextResponder chain
+  [familyBrowser setNextKeyView: faceBrowser];
+  [faceBrowser setNextKeyView: sizeField];
+  [sizeField setNextKeyView: sizeBrowser];
+  [sizeBrowser setNextKeyView: revertButton];
+  [revertButton setNextKeyView: previewButton];
+  [previewButton setNextKeyView: setButton];
+  [setButton setNextKeyView: familyBrowser];
+
+
   [v addSubview: topArea];
   RELEASE(topArea);
 
@@ -555,6 +589,8 @@
   RELEASE(bottomArea);
 
   [self setMinSize: [self frame].size];
+
+  [self setInitialFirstResponder: setButton];
   
   return self;
 }