1 files changed, 6 insertions, 1 deletions

diff --git a/apps/wps-display.c b/apps/wps-display.c
index acb839ea50..cc8009ec5c 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -414,7 +414,12 @@ static char* get_tag(struct mp3entry* id3,
 #endif
                 case 'p':  /* Playlist Position */
                     *flags |= WPS_REFRESH_STATIC;
-                    snprintf(buf, buf_size, "%d", id3->index + 1);
+                    {
+                        int index = id3->index - playlist_first_index();
+                        if (index < 0)
+                            index += playlist_amount();
+                        snprintf(buf, buf_size, "%d", index + 1);
+                    }
                     return buf;
 
                 case 'n':  /* Playlist Name (without path) */