diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index b00e1eba3d..db9c974ee8 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -640,8 +640,18 @@ bool playlist_viewer_ex(char* filename)
         {
             case ACTION_TREE_WPS:
             case ACTION_STD_CANCEL:
-                exit = true;
+            {
+                if (viewer.move_track >= 0)
+                {
+                    viewer.selected_track = viewer.move_track;
+                    gui_synclist_select_item(&playlist_lists, viewer.move_track);
+                    viewer.move_track = -1;
+                    gui_synclist_draw(&playlist_lists);
+                }
+                else
+                    exit = true;
                 break;
+            }
             case ACTION_STD_OK:
             {
                 struct playlist_entry * current_track =
diff --git a/docs/CREDITS b/docs/CREDITS
index da819bbcab..c93fcfa490 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -354,6 +354,7 @@ Gerritt Gonzales
 Martin Crkovský
 Ariya Hidayat
 Jonas Hurrelmann
+Lee Kang Hyuk
 
 The libmad team
 The wavpack team