diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index 5b2e97745..ceb693e09 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -140,7 +140,12 @@ NSString *CogPlaybackDidStopNotficiation = @"CogPlaybackDidStopNotficiation";
 
 - (IBAction)play:(id)sender {
 	if([playlistController shuffle] != ShuffleOff) {
-		PlaylistEntry *pe = [playlistController shuffledEntryAtIndex:0];
+		PlaylistEntry *pe = nil;
+
+		NSInteger index = [playlistView selectedRow];
+		if(index != -1) pe = [playlistController entryAtIndex:index];
+
+		pe = [playlistController shuffledEntryAtIndex:(pe ? pe.shuffleIndex : 0)];
 		[self playEntryAtIndex:pe.index];
 	} else {
 		if([playlistView selectedRow] == -1)