2 files changed, 5 insertions, 3 deletions

diff --git a/apps/wps-display.c b/apps/wps-display.c
index 3ddbc974c1..6bca8cb40d 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -530,7 +530,6 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all)
 {
     char buf[MAX_PATH];
     struct format_flags flags;
-    bool scroll_active = false;
     int i;
 #ifdef HAVE_LCD_BITMAP
     /* to find out wether the peak meter is enabled we
@@ -602,9 +601,8 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all)
             }
 #endif
 
-            if (!scroll_active && flags.scroll && !flags.dynamic)
+            if (flags.scroll && !flags.dynamic)
             {
-                scroll_active = true;
                 lcd_puts_scroll(0, i, buf);
             }
             else
diff --git a/apps/wps.c b/apps/wps.c
index 3c486b1786..f0ba54f3a3 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -700,6 +700,8 @@ int wps_show(void)
                         status_set_record(false);
                         status_set_audio(false);
 #endif
+                        lcd_stop_scroll();
+
                         /* set dir browser to current playing song */
                         if (global_settings.browse_current && id3)
                             set_current_file(id3->path);
@@ -833,6 +835,8 @@ int wps_show(void)
                 status_set_record(false);
                 status_set_audio(false);
 #endif
+                lcd_stop_scroll();
+
                 /* set dir browser to current playing song */
                 if (global_settings.browse_current && id3)
                     set_current_file(id3->path);