1 files changed, 2 insertions, 1 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index e1ea56ef..cba71f8c 100644
--- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -410,11 +410,12 @@ public class DownloadServiceImpl extends Service implements DownloadService {
     @Override
     public synchronized void shuffle() {
         Collections.shuffle(downloadList);
+		currentPlayingIndex = downloadList.indexOf(currentPlaying);
         if (currentPlaying != null) {
             downloadList.remove(getCurrentPlayingIndex());
             downloadList.add(0, currentPlaying);
+			currentPlayingIndex = 0;
         }
-		currentPlayingIndex = downloadList.indexOf(currentPlaying);
         revision++;
         lifecycleSupport.serializeDownloadQueue();
         updateJukeboxPlaylist();