diff --git a/macosx/English.lproj/InfoWindow.nib/info.nib b/macosx/English.lproj/InfoWindow.nib/info.nib
index d5f83ea10..deb3e720f 100644
--- a/macosx/English.lproj/InfoWindow.nib/info.nib
+++ b/macosx/English.lproj/InfoWindow.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>29 56 356 240 0 0 1024 746 </string>
+	<string>35 67 356 240 0 0 1152 842 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>549</key>
diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index cf4729498..7af9d508f 100644
Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 7ca8fa9b7..a150535b6 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -672,16 +672,20 @@
         else
             priority = PRIORITY_NORMAL;
         
+        NSIndexSet * fileIndexSet;
         for (i = [indexSet firstIndex]; i != NSNotFound && (!current || !other); i = [indexSet indexGreaterThanIndex: i])
         {
-            if ([torrent hasFilePriority: priority forIndexes: [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"]])
+            fileIndexSet = [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"];
+            if (![torrent canChangeDownloadCheckForFiles: fileIndexSet])
+                continue;
+            else if ([torrent hasFilePriority: priority forIndexes: fileIndexSet])
                 current = YES;
             else
                 other = YES;
         }
         
-        [menuItem setState: current ? (other ? NSMixedState : NSOnState) : NSOffState];
-        return YES;
+        [menuItem setState: current ? NSOnState : NSOffState];
+        return current || other;
     }
     
     return YES;