diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c
index 65a48611c0..01cbc31600 100644
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@@ -161,7 +161,9 @@ static int display_playlists(char* playlist, bool view)
 
 restart:
     browse.flags &= ~BROWSE_SELECTED;
-    if (rockbox_browse(&browse) == GO_TO_WPS)
+    int browse_ret = rockbox_browse(&browse);
+    if (browse_ret == GO_TO_WPS
+        || (view && browse_ret == GO_TO_PREVIOUS_MUSIC))
         result = 0;
 
     if (browse.flags & BROWSE_SELECTED)
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index e3faf4b68f..5b6e2991bc 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -883,7 +883,8 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename)
                 else
                 {
                     exit = true;
-                    ret = PLAYLIST_VIEWER_CANCEL;
+                    ret = button == ACTION_TREE_WPS ?
+                                    PLAYLIST_VIEWER_OK : PLAYLIST_VIEWER_CANCEL;
                 }
                 break;
             }