diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index d7c34e4300..71059aa593 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -848,9 +848,6 @@ bool playlist_viewer_ex(char* filename)
     {
         int track;
 
-        /* Timeout so we can determine if play status has changed */
-        button = button_get_w_tmo(HZ/2);
-
         if (!viewer.playlist && !(mpeg_status() & MPEG_STATUS_PLAY))
         {
             /* Play has stopped */
@@ -899,7 +896,7 @@ bool playlist_viewer_ex(char* filename)
             /* Playlist has changed (new track started?) */
             update_first_index();
             if (!update_playlist(false))
-                exit = true;
+                goto exit;
             else
                 update = true;
 
@@ -907,6 +904,9 @@ bool playlist_viewer_ex(char* filename)
             viewer.move_track = -1;
         }
 
+        /* Timeout so we can determine if play status has changed */
+        button = button_get_w_tmo(HZ/2);
+
         switch (button)
         {
 #ifdef HAVE_RECORDER_KEYPAD