diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 5f2eeaf7b8..09d6e48614 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -756,7 +756,11 @@ bool search_playlist(void)
 #endif
         );
         if (action_userabort(TIMEOUT_NOBLOCK))
-            return ret;
+        {
+            if (!found_indicies_count)
+                return ret;
+            break;
+        }
         playlist_get_track_info(viewer.playlist,i,&track);
         if (strcasestr(track.filename,search_str))
         {