1 files changed, 5 insertions, 2 deletions

diff --git a/apps/playback.c b/apps/playback.c
index dcc0487dc4..80760dfe85 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2125,8 +2125,11 @@ static void audio_new_playlist(void)
 
 static void initiate_track_change(long direction)
 {
-    playlist_end = false;
-    ci.new_track += direction;
+    if (playlist_check(direction))
+    {
+        playlist_end = false;
+        ci.new_track += direction;
+    }
 }
 
 static void initiate_dir_change(long direction)