diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index ffcca86f6..9f4b61ce6 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -432,7 +432,13 @@
 
 - (IBAction)clear:(id)sender
 {
+	[currentEntry setIndex:[NSNumber numberWithInt:-1]];
+	
 	[self removeObjects:[self content]];
+	[self updateTotalTime];
+
+	if (shuffle == YES)
+		[self resetShuffleList];
 }
 
 - (IBAction)clearFilterPredicate:(id)sender