diff --git a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib
index 9b44d2ea3a8..dc08cfc1eb5 100644
--- a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib
+++ b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib
@@ -3,10 +3,14 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>139 60 356 240 0 0 1600 1002 </string>
+	<string>103 92 356 240 0 0 1280 832 </string>
 	<key>IBFramework Version</key>
 	<string>364.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>401</integer>
+	</array>
 	<key>IBSystem Version</key>
-	<string>7S215</string>
+	<string>7U16</string>
 </dict>
 </plist>
diff --git a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/objects.nib b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/objects.nib
index ad17b32df5e..63b5e06c4d8 100644
Binary files a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/objects.nib and b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/objects.nib differ
diff --git a/mozilla/camino/src/browser/SearchTextField.m b/mozilla/camino/src/browser/SearchTextField.m
index 2079e983ae1..1b86b5d4eb5 100644
--- a/mozilla/camino/src/browser/SearchTextField.m
+++ b/mozilla/camino/src/browser/SearchTextField.m
@@ -219,15 +219,27 @@
         // If the user hit tab, go to the next key view
       case NSTabTextMovement:
       {
-//        [[self window] selectKeyViewFollowingView:self];
         // we should be able to just select the next key view, but at some point we have
         // to break the cycle and kick the user off the toolbar. Do it here. Selecting
-        // the window allows us to tab into the content area.
-        NSWindow* wind = [self window];
-        [wind makeFirstResponder:wind];
-
-//        if ([[self window] firstResponder] == [self window])
-//          [self selectText:self];
+        // the window allows us to tab into the content area (assuming we're on a toolbar).
+        BOOL isOnToolbar = NO;
+        NSView* parent = [self superview];
+        while (parent) {
+          if ([parent isKindOfClass:[NSToolbar class]])
+            isOnToolbar = YES;
+          parent = [parent superview];
+        }
+        if (isOnToolbar) {
+          // HACK: we're on a toolbar, make life not suck
+          NSWindow* wind = [self window];
+          [wind makeFirstResponder:wind];
+        }
+        else {
+          // do the normal key loop thang
+          [[self window] selectKeyViewFollowingView:self];
+          if ([[self window] firstResponder] == [self window])
+            [self selectText:self];
+        }
       }
           break;