diff --git a/core/playlist.c b/core/playlist.c
index fc3e175d..9ad49499 100644
--- a/core/playlist.c
+++ b/core/playlist.c
@@ -108,9 +108,20 @@ void playlist_sort(enum playlist_type_t type, const gchar *name,
 
 struct track *playlist_next(void)
 {
-	if (playlist_size(PL_SYSTEM, "Queued Tracks") > 0)
-		return playlist_types[PL_SYSTEM]->pl_next("Queued Tracks");
-	return playlist_types[PL_SYSTEM]->pl_next("Collection");
+	enum playlist_type_t type = settings_get(SETTINGS_CUR_TYPE);
+	unsigned int id = settings_get(SETTINGS_CUR_ID);
+	struct track *track;
+	gchar *name;
+
+	if (playlist_size(PL_SYSTEM, "Queued Tracks") > 0) {
+		type = PL_SYSTEM;
+		id   = SYS_PL_QUEUED;
+	}
+
+	name  = playlist_get_name(type, id);
+	track = playlist_types[type]->pl_next(name);
+	g_free(name);
+	return track;
 }
 
 struct track *playlist_prev(void)
diff --git a/tests/core/playlists/system.c b/tests/core/playlists/system.c
index 009b11ff..17fae1e9 100644
--- a/tests/core/playlists/system.c
+++ b/tests/core/playlists/system.c
@@ -178,6 +178,7 @@ static void test_queued()
 	__test_playlist_noselect("Queued Tracks");
 	__test_playlist_reinit("Queued Tracks", 2, true, true);
 
+	playlist_select(PL_SYSTEM, "Collection");
 	g_assert(playlist_next() == track_get(0));
 	g_assert_cmpuint(playlist_size(PL_SYSTEM, "Queued Tracks"), ==, 1);
 	g_assert(playlist_next() == track_get(1));