diff --git a/apps/wps-display.c b/apps/wps-display.c
index e11ec8a520..8cbf7db75e 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -355,6 +355,7 @@ static char* get_tag(struct mp3entry* cid3,
     {
         case 'I':  /* ID3 Information */
             id3 = nid3; /* display next-song data */
+            *flags |= WPS_REFRESH_DYNAMIC;
             if(!id3)
                 return NULL; /* no such info (yet) */
             /* fall-through */
@@ -422,6 +423,7 @@ static char* get_tag(struct mp3entry* cid3,
 
         case 'F':  /* File Information */
             id3 = nid3;
+            *flags |= WPS_REFRESH_DYNAMIC;
             if(!id3)
                 return NULL; /* no such info (yet) */
             /* fall-through */
@@ -581,6 +583,7 @@ static char* get_tag(struct mp3entry* cid3,
 
         case 'D': /* Directory path information */
             id3 = nid3; /* next song please! */
+            *flags |= WPS_REFRESH_DYNAMIC;
             if(!id3)
                 return NULL; /* no such info (yet) */
             /* fall-through */
diff --git a/apps/wps.c b/apps/wps.c
index cf2599d67c..6aa8a72b60 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -433,11 +433,11 @@ static bool update(void)
     bool track_changed = mpeg_has_changed_track();
     bool retcode = false;
 
+    nid3 = mpeg_next_track();
     if (track_changed)
     {
         lcd_stop_scroll();
         id3 = mpeg_current_track();
-        nid3 = mpeg_next_track();
         if (wps_display(id3, nid3))
             retcode = true;
         else