diff --git a/PlaybackController.m b/PlaybackController.m
index 66657ac61..4e6cf766c 100644
--- a/PlaybackController.m
+++ b/PlaybackController.m
@@ -197,7 +197,15 @@
 - (void)delegateRequestNextEntry:(PlaylistEntry *)curEntry
 {
 	PlaylistEntry *pe;
-	pe = [playlistController entryAtIndex:[curEntry index]+1];
+
+	if ([playlistController shuffle] == YES)
+	{
+		pe = [playlistController entryAtIndex:[curEntry shuffleIndex]+1];
+	}
+	else
+	{
+		pe = [playlistController entryAtIndex:[curEntry index]+1];
+	}
 	
 	if (pe == nil)
 		[soundController setNextEntry:nil];