diff --git a/mozilla/camino/BrowserWindowController.h b/mozilla/camino/BrowserWindowController.h
index b284d020c19..790ad4eb12d 100644
--- a/mozilla/camino/BrowserWindowController.h
+++ b/mozilla/camino/BrowserWindowController.h
@@ -181,8 +181,9 @@ class nsIDOMNode;
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSString*)aURLSpec suggestedFilename: (NSString*)aFilename;
-- (void)printDocument;
+- (IBAction)printDocument:(id)aSender;
 - (void)printPreview;
+- (IBAction)performSearch:(id)aSender;
 
 - (void)startThrobber;
 - (void)stopThrobber;
diff --git a/mozilla/camino/BrowserWindowController.mm b/mozilla/camino/BrowserWindowController.mm
index 7ec1e27e4b5..5126360cc5b 100644
--- a/mozilla/camino/BrowserWindowController.mm
+++ b/mozilla/camino/BrowserWindowController.mm
@@ -553,7 +553,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Search the Internet"];
         [toolbarItem setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(performSearch)];
+        [toolbarItem setAction:@selector(performSearch:)];
     } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
         [toolbarItem setLabel:@""];
         [toolbarItem setPaletteLabel:@"Progress"];
@@ -587,7 +587,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Print this page"];
         [toolbarItem setImage:[NSImage imageNamed:@"print"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(printDocument)];
+        [toolbarItem setAction:@selector(printDocument:)];
     } else {
         toolbarItem = nil;
     }
@@ -744,7 +744,7 @@ static NSArray* sToolbarDefaults = nil;
   [self openNewTabWithURL: viewSource referrer:nil loadInBackground: loadInBackground];
 }
 
-- (void)printDocument
+- (IBAction)printDocument:(id)aSender
 {
   [[mBrowserView getBrowserView] printDocument];
 }
@@ -756,7 +756,7 @@ static NSArray* sToolbarDefaults = nil;
   //[[mBrowserView getBrowserView] printPreview];
 }
 
-- (void)performSearch
+- (IBAction)performSearch:(id)aSender
 {
   NSString *searchEngine = NSLocalizedStringFromTable(@"SearchPageDefault", @"WebsiteDefaults", nil);
 
diff --git a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib
index ddf148a1f38..7db9e69cfc3 100644
--- a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib
@@ -16,6 +16,7 @@
                 closeTab = id; 
                 displayPreferencesWindow = id; 
                 doReload = id; 
+                doSearch = id; 
                 doStop = id; 
                 feedbackLink = id; 
                 findAgain = id; 
diff --git a/mozilla/camino/English.lproj/MainMenu.nib/info.nib b/mozilla/camino/English.lproj/MainMenu.nib/info.nib
index 184436a02c1..82ab55bbcf7 100644
--- a/mozilla/camino/English.lproj/MainMenu.nib/info.nib
+++ b/mozilla/camino/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>266</key>
 		<string>23 342 277 90 0 0 1152 746 </string>
 		<key>29</key>
-		<string>8 701 446 44 0 0 1152 746 </string>
+		<string>8 702 446 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -29,6 +29,10 @@
 	</dict>
 	<key>IBLastGroupID</key>
 	<string>2</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib
index 2e5c42d1bcc..22603b11536 100644
Binary files a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/camino/MainController.h b/mozilla/camino/MainController.h
index 2bad839fb48..e8347ae52ad 100644
--- a/mozilla/camino/MainController.h
+++ b/mozilla/camino/MainController.h
@@ -98,6 +98,7 @@ class BookmarksService;
 -(IBAction) goBack:(id)aSender;
 -(IBAction) goForward:(id)aSender;
 -(IBAction) goHome:(id)aSender;
+-(IBAction) doSearch:(id)aSender;
 -(IBAction) previousTab:(id)aSender;
 -(IBAction) nextTab:(id)aSender;
 
diff --git a/mozilla/camino/MainController.mm b/mozilla/camino/MainController.mm
index 22741cd47c3..33bce7499bf 100644
--- a/mozilla/camino/MainController.mm
+++ b/mozilla/camino/MainController.mm
@@ -258,7 +258,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController printDocument];
+    [browserController printDocument:aSender];
 }
 
 -(IBAction) printPreview:(id)aSender
@@ -363,6 +363,22 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) doSearch:(id)aSender
+{
+  NSWindow* browserWindow = [self getFrontmostBrowserWindow];
+  if (browserWindow) {
+    if (![browserWindow isMainWindow])
+      [browserWindow makeKeyAndOrderFront:self];
+    
+    [[browserWindow windowController] performSearch: aSender];
+  }
+  else {
+      [self newWindow:self];
+      browserWindow = [self getFrontmostBrowserWindow];
+      [[browserWindow windowController] performSearch: aSender];
+  }
+}
+
 - (void)adjustBookmarksMenuItemsEnabling:(BOOL)inBrowserWindowFrontmost;
 {
   [mAddBookmarkMenuItem 							setEnabled:inBrowserWindowFrontmost];
@@ -599,7 +615,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController viewSource: self];
+    [browserController viewSource: aSender];
 }
 
 -(BOOL)isMainWindowABrowserWindow
@@ -658,13 +674,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   if (action == @selector(newTab:) ||
         /* ... many more items go here ... */
+        /* action == @selector(goHome:) || */			// always enabled
+        /* action == @selector(doSearch:) || */		// always enabled
         action == @selector(printPage:) ||
         action == @selector(findInPage:) ||
         action == @selector(doReload:) ||
         action == @selector(biggerTextSize:) ||
         action == @selector(smallerTextSize:) ||
         action == @selector(viewSource:) ||
-        action == @selector(goHome:) ||
         action == @selector(savePage:)) {
     if (browserController)
       return YES;
diff --git a/mozilla/camino/MainMenu.nib/classes.nib b/mozilla/camino/MainMenu.nib/classes.nib
index ddf148a1f38..7db9e69cfc3 100644
--- a/mozilla/camino/MainMenu.nib/classes.nib
+++ b/mozilla/camino/MainMenu.nib/classes.nib
@@ -16,6 +16,7 @@
                 closeTab = id; 
                 displayPreferencesWindow = id; 
                 doReload = id; 
+                doSearch = id; 
                 doStop = id; 
                 feedbackLink = id; 
                 findAgain = id; 
diff --git a/mozilla/camino/MainMenu.nib/info.nib b/mozilla/camino/MainMenu.nib/info.nib
index 184436a02c1..82ab55bbcf7 100644
--- a/mozilla/camino/MainMenu.nib/info.nib
+++ b/mozilla/camino/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>266</key>
 		<string>23 342 277 90 0 0 1152 746 </string>
 		<key>29</key>
-		<string>8 701 446 44 0 0 1152 746 </string>
+		<string>8 702 446 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -29,6 +29,10 @@
 	</dict>
 	<key>IBLastGroupID</key>
 	<string>2</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/mozilla/camino/MainMenu.nib/objects.nib b/mozilla/camino/MainMenu.nib/objects.nib
index 2e5c42d1bcc..22603b11536 100644
Binary files a/mozilla/camino/MainMenu.nib/objects.nib and b/mozilla/camino/MainMenu.nib/objects.nib differ
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
index ddf148a1f38..7db9e69cfc3 100644
--- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -16,6 +16,7 @@
                 closeTab = id; 
                 displayPreferencesWindow = id; 
                 doReload = id; 
+                doSearch = id; 
                 doStop = id; 
                 feedbackLink = id; 
                 findAgain = id; 
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
index 184436a02c1..82ab55bbcf7 100644
--- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
+++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>266</key>
 		<string>23 342 277 90 0 0 1152 746 </string>
 		<key>29</key>
-		<string>8 701 446 44 0 0 1152 746 </string>
+		<string>8 702 446 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -29,6 +29,10 @@
 	</dict>
 	<key>IBLastGroupID</key>
 	<string>2</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib
index 2e5c42d1bcc..22603b11536 100644
Binary files a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/camino/src/application/MainController.h b/mozilla/camino/src/application/MainController.h
index 2bad839fb48..e8347ae52ad 100644
--- a/mozilla/camino/src/application/MainController.h
+++ b/mozilla/camino/src/application/MainController.h
@@ -98,6 +98,7 @@ class BookmarksService;
 -(IBAction) goBack:(id)aSender;
 -(IBAction) goForward:(id)aSender;
 -(IBAction) goHome:(id)aSender;
+-(IBAction) doSearch:(id)aSender;
 -(IBAction) previousTab:(id)aSender;
 -(IBAction) nextTab:(id)aSender;
 
diff --git a/mozilla/camino/src/application/MainController.mm b/mozilla/camino/src/application/MainController.mm
index 22741cd47c3..33bce7499bf 100644
--- a/mozilla/camino/src/application/MainController.mm
+++ b/mozilla/camino/src/application/MainController.mm
@@ -258,7 +258,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController printDocument];
+    [browserController printDocument:aSender];
 }
 
 -(IBAction) printPreview:(id)aSender
@@ -363,6 +363,22 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) doSearch:(id)aSender
+{
+  NSWindow* browserWindow = [self getFrontmostBrowserWindow];
+  if (browserWindow) {
+    if (![browserWindow isMainWindow])
+      [browserWindow makeKeyAndOrderFront:self];
+    
+    [[browserWindow windowController] performSearch: aSender];
+  }
+  else {
+      [self newWindow:self];
+      browserWindow = [self getFrontmostBrowserWindow];
+      [[browserWindow windowController] performSearch: aSender];
+  }
+}
+
 - (void)adjustBookmarksMenuItemsEnabling:(BOOL)inBrowserWindowFrontmost;
 {
   [mAddBookmarkMenuItem 							setEnabled:inBrowserWindowFrontmost];
@@ -599,7 +615,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController viewSource: self];
+    [browserController viewSource: aSender];
 }
 
 -(BOOL)isMainWindowABrowserWindow
@@ -658,13 +674,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   if (action == @selector(newTab:) ||
         /* ... many more items go here ... */
+        /* action == @selector(goHome:) || */			// always enabled
+        /* action == @selector(doSearch:) || */		// always enabled
         action == @selector(printPage:) ||
         action == @selector(findInPage:) ||
         action == @selector(doReload:) ||
         action == @selector(biggerTextSize:) ||
         action == @selector(smallerTextSize:) ||
         action == @selector(viewSource:) ||
-        action == @selector(goHome:) ||
         action == @selector(savePage:)) {
     if (browserController)
       return YES;
diff --git a/mozilla/camino/src/browser/BrowserWindowController.h b/mozilla/camino/src/browser/BrowserWindowController.h
index b284d020c19..790ad4eb12d 100644
--- a/mozilla/camino/src/browser/BrowserWindowController.h
+++ b/mozilla/camino/src/browser/BrowserWindowController.h
@@ -181,8 +181,9 @@ class nsIDOMNode;
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSString*)aURLSpec suggestedFilename: (NSString*)aFilename;
-- (void)printDocument;
+- (IBAction)printDocument:(id)aSender;
 - (void)printPreview;
+- (IBAction)performSearch:(id)aSender;
 
 - (void)startThrobber;
 - (void)stopThrobber;
diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm
index 7ec1e27e4b5..5126360cc5b 100644
--- a/mozilla/camino/src/browser/BrowserWindowController.mm
+++ b/mozilla/camino/src/browser/BrowserWindowController.mm
@@ -553,7 +553,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Search the Internet"];
         [toolbarItem setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(performSearch)];
+        [toolbarItem setAction:@selector(performSearch:)];
     } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
         [toolbarItem setLabel:@""];
         [toolbarItem setPaletteLabel:@"Progress"];
@@ -587,7 +587,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Print this page"];
         [toolbarItem setImage:[NSImage imageNamed:@"print"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(printDocument)];
+        [toolbarItem setAction:@selector(printDocument:)];
     } else {
         toolbarItem = nil;
     }
@@ -744,7 +744,7 @@ static NSArray* sToolbarDefaults = nil;
   [self openNewTabWithURL: viewSource referrer:nil loadInBackground: loadInBackground];
 }
 
-- (void)printDocument
+- (IBAction)printDocument:(id)aSender
 {
   [[mBrowserView getBrowserView] printDocument];
 }
@@ -756,7 +756,7 @@ static NSArray* sToolbarDefaults = nil;
   //[[mBrowserView getBrowserView] printPreview];
 }
 
-- (void)performSearch
+- (IBAction)performSearch:(id)aSender
 {
   NSString *searchEngine = NSLocalizedStringFromTable(@"SearchPageDefault", @"WebsiteDefaults", nil);
 
diff --git a/mozilla/chimera/BrowserWindowController.h b/mozilla/chimera/BrowserWindowController.h
index b284d020c19..790ad4eb12d 100644
--- a/mozilla/chimera/BrowserWindowController.h
+++ b/mozilla/chimera/BrowserWindowController.h
@@ -181,8 +181,9 @@ class nsIDOMNode;
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSString*)aURLSpec suggestedFilename: (NSString*)aFilename;
-- (void)printDocument;
+- (IBAction)printDocument:(id)aSender;
 - (void)printPreview;
+- (IBAction)performSearch:(id)aSender;
 
 - (void)startThrobber;
 - (void)stopThrobber;
diff --git a/mozilla/chimera/BrowserWindowController.mm b/mozilla/chimera/BrowserWindowController.mm
index 7ec1e27e4b5..5126360cc5b 100644
--- a/mozilla/chimera/BrowserWindowController.mm
+++ b/mozilla/chimera/BrowserWindowController.mm
@@ -553,7 +553,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Search the Internet"];
         [toolbarItem setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(performSearch)];
+        [toolbarItem setAction:@selector(performSearch:)];
     } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
         [toolbarItem setLabel:@""];
         [toolbarItem setPaletteLabel:@"Progress"];
@@ -587,7 +587,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Print this page"];
         [toolbarItem setImage:[NSImage imageNamed:@"print"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(printDocument)];
+        [toolbarItem setAction:@selector(printDocument:)];
     } else {
         toolbarItem = nil;
     }
@@ -744,7 +744,7 @@ static NSArray* sToolbarDefaults = nil;
   [self openNewTabWithURL: viewSource referrer:nil loadInBackground: loadInBackground];
 }
 
-- (void)printDocument
+- (IBAction)printDocument:(id)aSender
 {
   [[mBrowserView getBrowserView] printDocument];
 }
@@ -756,7 +756,7 @@ static NSArray* sToolbarDefaults = nil;
   //[[mBrowserView getBrowserView] printPreview];
 }
 
-- (void)performSearch
+- (IBAction)performSearch:(id)aSender
 {
   NSString *searchEngine = NSLocalizedStringFromTable(@"SearchPageDefault", @"WebsiteDefaults", nil);
 
diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
index ddf148a1f38..7db9e69cfc3 100644
--- a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
@@ -16,6 +16,7 @@
                 closeTab = id; 
                 displayPreferencesWindow = id; 
                 doReload = id; 
+                doSearch = id; 
                 doStop = id; 
                 feedbackLink = id; 
                 findAgain = id; 
diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/info.nib b/mozilla/chimera/English.lproj/MainMenu.nib/info.nib
index 184436a02c1..82ab55bbcf7 100644
--- a/mozilla/chimera/English.lproj/MainMenu.nib/info.nib
+++ b/mozilla/chimera/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>266</key>
 		<string>23 342 277 90 0 0 1152 746 </string>
 		<key>29</key>
-		<string>8 701 446 44 0 0 1152 746 </string>
+		<string>8 702 446 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -29,6 +29,10 @@
 	</dict>
 	<key>IBLastGroupID</key>
 	<string>2</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib
index 2e5c42d1bcc..22603b11536 100644
Binary files a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/chimera/MainController.h b/mozilla/chimera/MainController.h
index 2bad839fb48..e8347ae52ad 100644
--- a/mozilla/chimera/MainController.h
+++ b/mozilla/chimera/MainController.h
@@ -98,6 +98,7 @@ class BookmarksService;
 -(IBAction) goBack:(id)aSender;
 -(IBAction) goForward:(id)aSender;
 -(IBAction) goHome:(id)aSender;
+-(IBAction) doSearch:(id)aSender;
 -(IBAction) previousTab:(id)aSender;
 -(IBAction) nextTab:(id)aSender;
 
diff --git a/mozilla/chimera/MainController.mm b/mozilla/chimera/MainController.mm
index 22741cd47c3..33bce7499bf 100644
--- a/mozilla/chimera/MainController.mm
+++ b/mozilla/chimera/MainController.mm
@@ -258,7 +258,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController printDocument];
+    [browserController printDocument:aSender];
 }
 
 -(IBAction) printPreview:(id)aSender
@@ -363,6 +363,22 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) doSearch:(id)aSender
+{
+  NSWindow* browserWindow = [self getFrontmostBrowserWindow];
+  if (browserWindow) {
+    if (![browserWindow isMainWindow])
+      [browserWindow makeKeyAndOrderFront:self];
+    
+    [[browserWindow windowController] performSearch: aSender];
+  }
+  else {
+      [self newWindow:self];
+      browserWindow = [self getFrontmostBrowserWindow];
+      [[browserWindow windowController] performSearch: aSender];
+  }
+}
+
 - (void)adjustBookmarksMenuItemsEnabling:(BOOL)inBrowserWindowFrontmost;
 {
   [mAddBookmarkMenuItem 							setEnabled:inBrowserWindowFrontmost];
@@ -599,7 +615,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController viewSource: self];
+    [browserController viewSource: aSender];
 }
 
 -(BOOL)isMainWindowABrowserWindow
@@ -658,13 +674,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   if (action == @selector(newTab:) ||
         /* ... many more items go here ... */
+        /* action == @selector(goHome:) || */			// always enabled
+        /* action == @selector(doSearch:) || */		// always enabled
         action == @selector(printPage:) ||
         action == @selector(findInPage:) ||
         action == @selector(doReload:) ||
         action == @selector(biggerTextSize:) ||
         action == @selector(smallerTextSize:) ||
         action == @selector(viewSource:) ||
-        action == @selector(goHome:) ||
         action == @selector(savePage:)) {
     if (browserController)
       return YES;
diff --git a/mozilla/chimera/MainMenu.nib/classes.nib b/mozilla/chimera/MainMenu.nib/classes.nib
index ddf148a1f38..7db9e69cfc3 100644
--- a/mozilla/chimera/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/MainMenu.nib/classes.nib
@@ -16,6 +16,7 @@
                 closeTab = id; 
                 displayPreferencesWindow = id; 
                 doReload = id; 
+                doSearch = id; 
                 doStop = id; 
                 feedbackLink = id; 
                 findAgain = id; 
diff --git a/mozilla/chimera/MainMenu.nib/info.nib b/mozilla/chimera/MainMenu.nib/info.nib
index 184436a02c1..82ab55bbcf7 100644
--- a/mozilla/chimera/MainMenu.nib/info.nib
+++ b/mozilla/chimera/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>266</key>
 		<string>23 342 277 90 0 0 1152 746 </string>
 		<key>29</key>
-		<string>8 701 446 44 0 0 1152 746 </string>
+		<string>8 702 446 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -29,6 +29,10 @@
 	</dict>
 	<key>IBLastGroupID</key>
 	<string>2</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/mozilla/chimera/MainMenu.nib/objects.nib b/mozilla/chimera/MainMenu.nib/objects.nib
index 2e5c42d1bcc..22603b11536 100644
Binary files a/mozilla/chimera/MainMenu.nib/objects.nib and b/mozilla/chimera/MainMenu.nib/objects.nib differ
diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
index ddf148a1f38..7db9e69cfc3 100644
--- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -16,6 +16,7 @@
                 closeTab = id; 
                 displayPreferencesWindow = id; 
                 doReload = id; 
+                doSearch = id; 
                 doStop = id; 
                 feedbackLink = id; 
                 findAgain = id; 
diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib
index 184436a02c1..82ab55bbcf7 100644
--- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>266</key>
 		<string>23 342 277 90 0 0 1152 746 </string>
 		<key>29</key>
-		<string>8 701 446 44 0 0 1152 746 </string>
+		<string>8 702 446 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -29,6 +29,10 @@
 	</dict>
 	<key>IBLastGroupID</key>
 	<string>2</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib
index 2e5c42d1bcc..22603b11536 100644
Binary files a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/chimera/src/application/MainController.h b/mozilla/chimera/src/application/MainController.h
index 2bad839fb48..e8347ae52ad 100644
--- a/mozilla/chimera/src/application/MainController.h
+++ b/mozilla/chimera/src/application/MainController.h
@@ -98,6 +98,7 @@ class BookmarksService;
 -(IBAction) goBack:(id)aSender;
 -(IBAction) goForward:(id)aSender;
 -(IBAction) goHome:(id)aSender;
+-(IBAction) doSearch:(id)aSender;
 -(IBAction) previousTab:(id)aSender;
 -(IBAction) nextTab:(id)aSender;
 
diff --git a/mozilla/chimera/src/application/MainController.mm b/mozilla/chimera/src/application/MainController.mm
index 22741cd47c3..33bce7499bf 100644
--- a/mozilla/chimera/src/application/MainController.mm
+++ b/mozilla/chimera/src/application/MainController.mm
@@ -258,7 +258,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController printDocument];
+    [browserController printDocument:aSender];
 }
 
 -(IBAction) printPreview:(id)aSender
@@ -363,6 +363,22 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) doSearch:(id)aSender
+{
+  NSWindow* browserWindow = [self getFrontmostBrowserWindow];
+  if (browserWindow) {
+    if (![browserWindow isMainWindow])
+      [browserWindow makeKeyAndOrderFront:self];
+    
+    [[browserWindow windowController] performSearch: aSender];
+  }
+  else {
+      [self newWindow:self];
+      browserWindow = [self getFrontmostBrowserWindow];
+      [[browserWindow windowController] performSearch: aSender];
+  }
+}
+
 - (void)adjustBookmarksMenuItemsEnabling:(BOOL)inBrowserWindowFrontmost;
 {
   [mAddBookmarkMenuItem 							setEnabled:inBrowserWindowFrontmost];
@@ -599,7 +615,7 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 {
   BrowserWindowController* browserController = [self getMainWindowBrowserController];
   if (browserController)
-    [browserController viewSource: self];
+    [browserController viewSource: aSender];
 }
 
 -(BOOL)isMainWindowABrowserWindow
@@ -658,13 +674,14 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   if (action == @selector(newTab:) ||
         /* ... many more items go here ... */
+        /* action == @selector(goHome:) || */			// always enabled
+        /* action == @selector(doSearch:) || */		// always enabled
         action == @selector(printPage:) ||
         action == @selector(findInPage:) ||
         action == @selector(doReload:) ||
         action == @selector(biggerTextSize:) ||
         action == @selector(smallerTextSize:) ||
         action == @selector(viewSource:) ||
-        action == @selector(goHome:) ||
         action == @selector(savePage:)) {
     if (browserController)
       return YES;
diff --git a/mozilla/chimera/src/browser/BrowserWindowController.h b/mozilla/chimera/src/browser/BrowserWindowController.h
index b284d020c19..790ad4eb12d 100644
--- a/mozilla/chimera/src/browser/BrowserWindowController.h
+++ b/mozilla/chimera/src/browser/BrowserWindowController.h
@@ -181,8 +181,9 @@ class nsIDOMNode;
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSString*)aURLSpec suggestedFilename: (NSString*)aFilename;
-- (void)printDocument;
+- (IBAction)printDocument:(id)aSender;
 - (void)printPreview;
+- (IBAction)performSearch:(id)aSender;
 
 - (void)startThrobber;
 - (void)stopThrobber;
diff --git a/mozilla/chimera/src/browser/BrowserWindowController.mm b/mozilla/chimera/src/browser/BrowserWindowController.mm
index 7ec1e27e4b5..5126360cc5b 100644
--- a/mozilla/chimera/src/browser/BrowserWindowController.mm
+++ b/mozilla/chimera/src/browser/BrowserWindowController.mm
@@ -553,7 +553,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Search the Internet"];
         [toolbarItem setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(performSearch)];
+        [toolbarItem setAction:@selector(performSearch:)];
     } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
         [toolbarItem setLabel:@""];
         [toolbarItem setPaletteLabel:@"Progress"];
@@ -587,7 +587,7 @@ static NSArray* sToolbarDefaults = nil;
         [toolbarItem setToolTip:@"Print this page"];
         [toolbarItem setImage:[NSImage imageNamed:@"print"]];
         [toolbarItem setTarget:self];
-        [toolbarItem setAction:@selector(printDocument)];
+        [toolbarItem setAction:@selector(printDocument:)];
     } else {
         toolbarItem = nil;
     }
@@ -744,7 +744,7 @@ static NSArray* sToolbarDefaults = nil;
   [self openNewTabWithURL: viewSource referrer:nil loadInBackground: loadInBackground];
 }
 
-- (void)printDocument
+- (IBAction)printDocument:(id)aSender
 {
   [[mBrowserView getBrowserView] printDocument];
 }
@@ -756,7 +756,7 @@ static NSArray* sToolbarDefaults = nil;
   //[[mBrowserView getBrowserView] printPreview];
 }
 
-- (void)performSearch
+- (IBAction)performSearch:(id)aSender
 {
   NSString *searchEngine = NSLocalizedStringFromTable(@"SearchPageDefault", @"WebsiteDefaults", nil);