diff --git a/lib/browser/modules/drive-scanner.js b/lib/browser/modules/drive-scanner.js
index 97113d2d..29143a9c 100644
--- a/lib/browser/modules/drive-scanner.js
+++ b/lib/browser/modules/drive-scanner.js
@@ -100,7 +100,7 @@ driveScanner.service('DriveScannerService', function($q, $interval, $timeout) {
    * });
    */
   this.scan = function() {
-    return $q.when(drives.listRemovable()).catch(dialog.showError);
+    return $q.when(drives.listRemovable());
   };
 
   /**
@@ -130,7 +130,7 @@ driveScanner.service('DriveScannerService', function($q, $interval, $timeout) {
       return self.scan().then(function(drives) {
         emitter.emit('scan', drives);
         self.setDrives(drives);
-      });
+      }).catch(dialog.showError);
     };
 
     // Make sure any pending interval is cancelled