Index: apps/playlist_viewer.c
===================================================================
--- apps/playlist_viewer.c	(revision 28175)
+++ apps/playlist_viewer.c	(working copy)
@@ -278,7 +278,7 @@
     size_t buffer_size;
     bool is_playing = audio_status() & (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE);
     bool have_list = filename || is_playing;
-    if (!have_list && (global_status.resume_index != -1))
+    if (!have_list)
     {
         /* Try to restore the list from control file */
         have_list = (playlist_resume() != -1);
Index: apps/playback.c
===================================================================
--- apps/playback.c	(revision 28175)
+++ apps/playback.c	(working copy)
@@ -3786,4 +3786,8 @@
 #endif
     codec_thread_resume();
     thread_thaw(audio_thread_id);
+
+    /* Load the old playlist, to ensure that behaviour with and without
+     * rebooting is consistent */
+    playlist_resume();
 }