diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index d0f70062a..62541da41 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>32 330 617 240 0 0 1024 746 </string>
+	<string>13 189 617 240 0 0 1024 746 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
@@ -29,10 +29,10 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>513</integer>
+		<integer>823</integer>
 		<integer>463</integer>
 		<integer>29</integer>
 		<integer>21</integer>
-		<integer>823</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8I127</string>
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 3bc5dac71..74275ed5d 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 74ba816d7..e932440a1 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -593,9 +593,18 @@
 
 - (void)setFilterPredicate:(NSPredicate *)filterPredicate
 {
-	[self updateIndexesFromRow:0];
-	
 	[super setFilterPredicate:filterPredicate];
+
+	int j;
+	for (j = 0; j < [[self content] count]; j++)
+	{
+		PlaylistEntry *p;
+		p = [[self content] objectAtIndex:j];
+		
+		[p setIndex:-1];
+	}
+	
+	[self updateIndexesFromRow:0];
 }
 
 - (void)savePlaylist:(NSString *)filename