1 files changed, 14 insertions, 0 deletions

diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 10c971fcc4..2a595f74e6 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -464,7 +464,21 @@ static void play_hop(int direction)
         if (direction > 0)
             next_track();
         else if (direction < 0)
+        {
+            if (step > 0 && global_settings.rewind_across_tracks && elapsed < DEFAULT_SKIP_THRESH && playlist_check(-1))
+            {
+                bool audio_paused = (audio_status() & AUDIO_STATUS_PAUSE)?true:false;
+                if (!audio_paused)
+                    audio_pause();
+                audio_prev();
+                audio_ff_rewind(-step);
+                if (!audio_paused)
+                    audio_resume();
+                return;
+            }
+
             prev_track(DEFAULT_SKIP_THRESH);
+        }
         return;
     }
     else if (direction == 1 && step >= remaining)