diff --git a/lib/gui/app.js b/lib/gui/app.js
index fa2e36a6..3abbd3f6 100644
--- a/lib/gui/app.js
+++ b/lib/gui/app.js
@@ -214,6 +214,10 @@ app.controller('AppController', function(
   };
 
   this.selectDrive = (drive) => {
+    if (!drive) {
+      return;
+    }
+
     this.selection.setDrive(drive);
 
     AnalyticsService.logEvent('Select drive', {
diff --git a/lib/gui/components/drive-selector/controllers/drive-selector.js b/lib/gui/components/drive-selector/controllers/drive-selector.js
index 6e8fa0b5..8ec1a003 100644
--- a/lib/gui/components/drive-selector/controllers/drive-selector.js
+++ b/lib/gui/components/drive-selector/controllers/drive-selector.js
@@ -56,7 +56,7 @@ module.exports = function($uibModalInstance, DrivesModel, SelectionStateModel) {
     // is resolved with a non-existent drive.
     if (!selectedDrive || !_.includes(this.drives.getDrives(), selectedDrive)) {
 
-      $uibModalInstance.dismiss();
+      $uibModalInstance.close();
     } else {
       $uibModalInstance.close(selectedDrive);
     }