diff --git a/beets/importer.py b/beets/importer.py
index eaba11435..cf4da883e 100644
--- a/beets/importer.py
+++ b/beets/importer.py
@@ -435,8 +435,7 @@ class ImportTask(object):
         # the pipeline.
         if self.skip:
             return
-        album = session.lib.get_album(self.album_id)
-        plugins.send('album_imported', lib=session.lib, album=album)
+        plugins.send('album_imported', lib=session.lib, album=self.album)
 
     def lookup_candidates(self):
         """Retrieve and store candidates for this album.
@@ -549,6 +548,10 @@ class ImportTask(object):
 
         plugins.send('import_task_files', session=session, task=self)
 
+    def add(self, lib):
+        """Add the items as an album to the library.
+        """
+        self.album = lib.add_album(self.imported_items())
 
     # Utilities.
 
@@ -635,6 +638,10 @@ class SingletonImportTask(ImportTask):
 
     duplicate_items = find_duplicates
 
+    def add(self, lib):
+        lib.add(self.item)
+
+
     def infer_album_fields(self):
         raise NotImplementedError
 
@@ -1047,14 +1054,7 @@ def apply_choices(session):
                     item.remove()
 
             # Add new ones.
-            if task.is_album:
-                # Add an album.
-                album = session.lib.add_album(items)
-                task.album_id = album.id
-            else:
-                # Add tracks.
-                for item in items:
-                    session.lib.add(item)
+            task.add(session.lib)
 
 
 def plugin_stage(session, func):