diff --git a/Tonuino.ino b/Tonuino.ino
index c3ce9c9b..c6954a7f 100644
--- a/Tonuino.ino
+++ b/Tonuino.ino
@@ -605,7 +605,7 @@ static void previousTrack() {
     else
     {
       Serial.print(F("Anfang der Queue -> springe ans Ende "));
-      currentTrack = numTracksInFolder;
+      currentTrack = numTracksInFolder - firstTrack + 1;
     }
     Serial.println(queue[currentTrack - 1]);
     mp3.playFolderTrack(myFolder->folder, queue[currentTrack - 1]);