diff --git a/apps/playlist.c b/apps/playlist.c
index cbd8eeb6a2..92a7ad979b 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -78,7 +78,7 @@ char* playlist_next(int steps)
     char *dir_end;
 
     playlist.index = (playlist.index+steps) % playlist.amount;
-    if ( playlist.index < 0 ) {
+    while ( playlist.index < 0 ) {
         if ( global_settings.loop_playlist )
             playlist.index += playlist.amount;
         else