--- chimera/BrowserWindowController.mm	2002/02/22 02:13:42	1.35
+++ chimera/BrowserWindowController.mm	2002/02/22 09:16:48	1.36
@@ -349,13 +349,17 @@ static NSString *PrintToolbarItemIdentif
 
 - (IBAction)toggleSidebar:(id)aSender
 {
+    NSResponder* resp = [[self window] firstResponder];
+    [[self window] makeFirstResponder: nil];
+    
     if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) 	{
         // XXXHack to bypass sidebar crashes.
-        [[self window] makeFirstResponder: nil];
         [mSidebarDrawer open];
     } else {
         [mSidebarDrawer close];
     }
+    
+    [[self window] makeFirstResponder: resp];
 }
 
 -(void)loadURL:(NSURL*)aURL