1 files changed, 3 insertions, 4 deletions

diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 3cda2fb44a..cef232c6fc 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -857,7 +857,7 @@ long gui_wps_show(void)
             case ACTION_WPS_SEEKFWD:
                 if (current_tick -last_right < HZ)
                 {
-                    if (state->id3->cuesheet)
+                    if (state->id3->cuesheet && playlist_check(1))
                     {
                         audio_next();
                     }
@@ -875,10 +875,9 @@ long gui_wps_show(void)
             case ACTION_WPS_SEEKBACK:
                 if (current_tick - last_left < HZ)
                 {
-                    if (state->id3->cuesheet)
+                    if (state->id3->cuesheet && playlist_check(-1))
                     {
-                        audio_pre_ff_rewind();
-                        audio_ff_rewind(0);
+                        audio_prev();
                     }
                     else
                     {