diff --git a/macosx/Controller.m b/macosx/Controller.m
index d8b43ea4b..8d6c26a7f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1912,6 +1912,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         [item setImage: [NSImage imageNamed: @"Open.png"]];
         [item setTarget: self];
         [item setAction: @selector(openShowSheet:)];
+        [item setAutovalidates: NO];
     }
     else if ([ident isEqualToString: TOOLBAR_REMOVE])
     {
@@ -1930,6 +1931,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         [item setImage: [NSImage imageNamed: @"Info.png"]];
         [item setTarget: self];
         [item setAction: @selector(showInfo:)];
+        [item setAutovalidates: NO];
     }
     else if ([ident isEqualToString: TOOLBAR_PAUSE_ALL])
     {
@@ -1975,6 +1977,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         [item setImage: [NSImage imageNamed: @"Filter.png"]];
         [item setTarget: self];
         [item setAction: @selector(toggleFilterBar:)];
+        [item setAutovalidates: NO];
     }
     else
     {
diff --git a/macosx/English.lproj/PrefsWindow.nib/info.nib b/macosx/English.lproj/PrefsWindow.nib/info.nib
index 32428af3b..6406ab26b 100644
--- a/macosx/English.lproj/PrefsWindow.nib/info.nib
+++ b/macosx/English.lproj/PrefsWindow.nib/info.nib
@@ -7,11 +7,11 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>153</key>
-		<string>286 248 563 267 0 0 1152 842 </string>
+		<string>235 384 563 267 0 0 1152 842 </string>
 		<key>28</key>
 		<string>294 434 563 290 0 0 1152 842 </string>
 		<key>41</key>
-		<string>128 481 563 305 0 0 1152 842 </string>
+		<string>161 288 563 305 0 0 1152 842 </string>
 		<key>66</key>
 		<string>294 507 563 144 0 0 1152 842 </string>
 	</dict>
@@ -23,8 +23,8 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>41</integer>
 		<integer>153</integer>
+		<integer>41</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8L127</string>
diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib
index 3c27885ac..ca4348f0d 100644
Binary files a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib and b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib differ
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 1ae7639fe..834b42938 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -167,6 +167,7 @@
         [item setImage: [NSImage imageNamed: @"Preferences.png"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
+        [item setAutovalidates: NO];
     }
     else if ([ident isEqualToString: TOOLBAR_TRANSFERS])
     {
@@ -174,6 +175,7 @@
         [item setImage: [NSImage imageNamed: @"Transfers.png"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
+        [item setAutovalidates: NO];
     }
     else if ([ident isEqualToString: TOOLBAR_BANDWIDTH])
     {
@@ -181,6 +183,7 @@
         [item setImage: [NSImage imageNamed: @"Bandwidth.png"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
+        [item setAutovalidates: NO];
     }
     else if ([ident isEqualToString: TOOLBAR_NETWORK])
     {
@@ -188,6 +191,7 @@
         [item setImage: [NSImage imageNamed: @"Network.png"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
+        [item setAutovalidates: NO];
     }
     else
     {