diff --git a/core/tags/album.c b/core/tags/album.c
index defa9c4c..3fb85c11 100644
--- a/core/tags/album.c
+++ b/core/tags/album.c
@@ -79,7 +79,7 @@ static const struct db_ops album_ops = {
 void album_db_init()
 {
 	db_init(&album_db, "album.db", true, &album_ops);
-	db_load(&album_db);
+	db_load_idle(&album_db);
 }
 
 void album_db_deinit()
diff --git a/core/tags/artist.c b/core/tags/artist.c
index bf53fcf0..689f3323 100644
--- a/core/tags/artist.c
+++ b/core/tags/artist.c
@@ -59,7 +59,7 @@ static const struct db_ops artist_ops = {
 void artist_db_init()
 {
 	db_init(&artist_db, "artist.db", true, &artist_ops);
-	db_load(&artist_db);
+	db_load_idle(&artist_db);
 }
 
 void artist_db_deinit()
diff --git a/core/tags/genre.c b/core/tags/genre.c
index 9226146e..5f819e8e 100644
--- a/core/tags/genre.c
+++ b/core/tags/genre.c
@@ -58,7 +58,7 @@ static const struct db_ops genre_ops = {
 void genre_db_init()
 {
 	db_init(&genre_db, "genre.db", true, &genre_ops);
-	db_load(&genre_db);
+	db_load_idle(&genre_db);
 }
 
 void genre_db_deinit()
diff --git a/core/tags/library.c b/core/tags/library.c
index d0a74224..08b4ad8f 100644
--- a/core/tags/library.c
+++ b/core/tags/library.c
@@ -62,7 +62,7 @@ static const struct db_ops library_ops = {
 void library_db_init()
 {
 	db_init(&library_db, "library.db", true, &library_ops);
-	db_load(&library_db);
+	db_load_idle(&library_db);
 }
 
 void library_db_deinit()
diff --git a/core/tags/track.c b/core/tags/track.c
index f8b2374e..79e3cd64 100644
--- a/core/tags/track.c
+++ b/core/tags/track.c
@@ -167,7 +167,7 @@ static const struct db_ops track_ops = {
 void track_db_init()
 {
 	db_init(&track_db, "track.db", false, &track_ops);
-	db_load(&track_db);
+	db_load_idle(&track_db);
 }
 
 void track_db_deinit()
diff --git a/tests/core/tags/track.c b/tests/core/tags/track.c
index 6329f787..60483024 100644
--- a/tests/core/tags/track.c
+++ b/tests/core/tags/track.c
@@ -2,6 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 #include <core/filter.h>
+#include <core/idle.h>
 #include <core/string.h>
 #include <core/tags/tags.h>
 #include <core/tags/track.h>
@@ -74,6 +75,8 @@ static void test_track()
 	filter_init();
 	tags_init();
 	file_init(&f, "track_tag", 0);
+	while (idle_run_task()) {}
+
 	date    = string_tm2str(now);
 	library = library_find("tests/Music");