diff --git a/gui/playlist.c b/gui/playlist.c
index 8b979600..98e3b5ae 100644
--- a/gui/playlist.c
+++ b/gui/playlist.c
@@ -313,21 +313,23 @@ bool __gui_playlist_init_idle()
 {
 	struct db_entry *dbe, *next;
 	GtkTreeSelection *selection;
+	GtkTreeView *treeview;
 	GtkTreeModel *filter;
 	GtkTreeIter iter;
 
 	filter    = GTK_TREE_MODEL(gui_builder_object("o_playlist_filter"));
-	selection = gtk_tree_view_get_selection(
-			GTK_TREE_VIEW(gui_builder_widget("o_playlist_view")));
+	treeview  = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
+	selection = gtk_tree_view_get_selection(treeview);
 	gtk_tree_model_get_iter_first(filter, &iter);
 	gtk_tree_selection_select_iter(selection, &iter);
 
 	p_filter_enable = false;
-	db_for_each(dbe, next, artist_db_get())
-		gui_playlist_add_artist(ARTIST(dbe));
-
 	db_for_each(dbe, next, pl_user_db_get())
 		gui_playlist_add_user(&USER_PLAYLIST(dbe)->pl_playlist);
+	gtk_tree_view_expand_all(treeview);
+
+	db_for_each(dbe, next, artist_db_get())
+		gui_playlist_add_artist(ARTIST(dbe));
 	p_filter_enable = true;
 
 	p_init_done = true;
@@ -381,7 +383,6 @@ void gui_playlist_init()
 	gtk_tree_store_insert(p_store, &parent, NULL, -1);
 	__playlist_set(&parent, "<big>Library</big>", "system-file-manager", 0);
 
-	gtk_tree_view_expand_all(treeview);
 	gtk_tree_selection_set_select_function(
 					gtk_tree_view_get_selection(treeview),
 					__playlist_on_select, NULL, NULL);