diff --git a/emmental.py b/emmental.py
index e319bef..dc4742e 100755
--- a/emmental.py
+++ b/emmental.py
@@ -16,6 +16,8 @@ class Application(Gtk.Application):
     def do_startup(self):
         Gtk.Application.do_startup(self)
         self.add_window(ui.window.Window())
+        for i in range(db.library.Table.get_n_items()):
+            scanner.update_library(db.library.Table.get_item(i))
 
     def do_activate(self):
         for window in self.get_windows():
diff --git a/scanner/__init__.py b/scanner/__init__.py
index 997be54..a378085 100644
--- a/scanner/__init__.py
+++ b/scanner/__init__.py
@@ -31,6 +31,7 @@ def commit():
 
 def update_library(lib):
     Queue.push(task.CheckSchedulerTask(lib))
+    Queue.push(task.DirectoryTask(lib, lib.path))
 
 def remove_library(lib):
     Queue.push(task.RemoveLibrarySchedulerTask(lib))
diff --git a/scanner/test_scanner.py b/scanner/test_scanner.py
index fd91b30..e300d66 100644
--- a/scanner/test_scanner.py
+++ b/scanner/test_scanner.py
@@ -20,6 +20,8 @@ class TestScanner(unittest.TestCase):
         scanner.update_library(lib)
         self.assertIsInstance(scanner.Queue.tasks[0],
                               scanner.task.CheckSchedulerTask)
+        self.assertIsInstance(scanner.Queue.tasks[1],
+                              scanner.task.DirectoryTask)
 
     def test_remove_library(self):
         lib = db.library.Table.find(test_album)