diff --git a/CHANGELOG b/CHANGELOG
index 9d471658..88315314 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 6.4.18:
+- Load each artist playlist in a separate idle task
 - UI spacing improvements
 
 6.4.18-rc:
diff --git a/core/playlists/artist.c b/core/playlists/artist.c
index f1b7d14d..54b7506b 100644
--- a/core/playlists/artist.c
+++ b/core/playlists/artist.c
@@ -28,13 +28,16 @@ static void __artist_pl_free(struct playlist *playlist)
 
 static bool __artist_pl_load(void *data)
 {
-	struct playlist *playlist;
+	struct playlist *playlist = (struct playlist *)data;
+	struct artist   *artist   = artist_lookup(playlist->pl_name);
 	struct db_entry *dbe, *next;
 
+	queue_set_flag(&playlist->pl_queue, Q_ADD_FRONT);
 	db_for_each(dbe, next, track_db_get()) {
-		playlist = TRACK(dbe)->tr_artist->ar_playlist;
-		queue_add(&playlist->pl_queue, TRACK(dbe));
+		if (TRACK(dbe)->tr_artist == artist)
+			queue_add(&playlist->pl_queue, TRACK(dbe));
 	}
+	queue_unset_flag(&playlist->pl_queue, Q_ADD_FRONT);
 
 	return true;
 }
@@ -95,6 +98,8 @@ static bool __artist_pl_init(void *data)
 	db_for_each(dbe, next, artist_db_get()) {
 		playlist = __artist_pl_alloc(ARTIST(dbe)->ar_name);
 		ARTIST(dbe)->ar_playlist = playlist;
+
+		idle_schedule(IDLE_SYNC, __artist_pl_load, playlist);
 	}
 
 	return true;
@@ -104,7 +109,6 @@ void pl_artist_init(struct queue_ops *ops)
 {
 	artist_ops = ops;
 	idle_schedule(IDLE_SYNC, __artist_pl_init, NULL);
-	idle_schedule(IDLE_SYNC, __artist_pl_load, NULL);
 }
 
 void pl_artist_deinit()