diff --git a/lib/browser/components/drive-selector/drive-selector.js b/lib/browser/components/drive-selector/drive-selector.js
index aa59ce5f..24ff09d7 100644
--- a/lib/browser/components/drive-selector/drive-selector.js
+++ b/lib/browser/components/drive-selector/drive-selector.js
@@ -23,10 +23,12 @@
 const angular = require('angular');
 require('angular-ui-bootstrap');
 require('../../../browser/modules/drive-scanner');
+require('../../../browser/models/selection-state');
 
 const DriveSelector = angular.module('Etcher.Components.DriveSelector', [
   'ui.bootstrap',
-  'Etcher.drive-scanner'
+  'Etcher.drive-scanner',
+  'Etcher.Models.SelectionState'
 ]);
 
 DriveSelector.controller('DriveSelectorController', require('./controllers/drive-selector'));
diff --git a/lib/browser/components/drive-selector/services/drive-selector-state.js b/lib/browser/components/drive-selector/services/drive-selector-state.js
index 17ceba96..e3759af9 100644
--- a/lib/browser/components/drive-selector/services/drive-selector-state.js
+++ b/lib/browser/components/drive-selector/services/drive-selector-state.js
@@ -18,7 +18,8 @@
 
 const _ = require('lodash');
 
-module.exports = function() {
+module.exports = function(SelectionStateModel) {
+  let self = this;
 
   /**
    * @summary Toggle select drive
@@ -32,9 +33,9 @@ module.exports = function() {
    */
   this.toggleSelectDrive = function(drive) {
     if (this.isSelectedDrive(drive)) {
-      this.selectedDrive = null;
+      SelectionStateModel.removeDrive();
     } else {
-      this.selectedDrive = drive;
+      SelectionStateModel.setDrive(drive);
     }
   };
 
@@ -56,7 +57,7 @@ module.exports = function() {
       return false;
     }
 
-    return drive.device === _.get(this.selectedDrive, 'device');
+    return drive.device === _.get(self.getSelectedDrive(), 'device');
   };
 
   /**
@@ -69,12 +70,6 @@ module.exports = function() {
    * @example
    * const drive = DriveSelectorStateService.getSelectedDrive();
    */
-  this.getSelectedDrive = function() {
-    if (_.isEmpty(this.selectedDrive)) {
-      return;
-    }
-
-    return this.selectedDrive;
-  };
+  this.getSelectedDrive = SelectionStateModel.getDrive;
 
 };
diff --git a/lib/browser/models/selection-state.js b/lib/browser/models/selection-state.js
index 96acf8ec..3256388b 100644
--- a/lib/browser/models/selection-state.js
+++ b/lib/browser/models/selection-state.js
@@ -75,6 +75,10 @@ SelectionStateModel.service('SelectionStateModel', function() {
    * const drive = SelectionStateModel.getDrive();
    */
   this.getDrive = function() {
+    if (_.isEmpty(selection.drive)) {
+      return;
+    }
+
     return selection.drive;
   };
 
diff --git a/tests/browser/components/drive-selector.spec.js b/tests/browser/components/drive-selector.spec.js
index b2d5c04f..c61164ae 100644
--- a/tests/browser/components/drive-selector.spec.js
+++ b/tests/browser/components/drive-selector.spec.js
@@ -12,11 +12,17 @@ describe('Browser: DriveSelector', function() {
   describe('DriveSelectorStateService', function() {
 
     let DriveSelectorStateService;
+    let SelectionStateModel;
 
-    beforeEach(angular.mock.inject(function(_DriveSelectorStateService_) {
+    beforeEach(angular.mock.inject(function(_DriveSelectorStateService_, _SelectionStateModel_) {
       DriveSelectorStateService = _DriveSelectorStateService_;
+      SelectionStateModel = _SelectionStateModel_;
     }));
 
+    beforeEach(function() {
+      SelectionStateModel.clear();
+    });
+
     describe('.toggleSelectDrive()', function() {
 
       it('should be able to toggle a drive', function() {
@@ -63,7 +69,7 @@ describe('Browser: DriveSelector', function() {
           size: '16GB'
         };
 
-        DriveSelectorStateService.selectedDrive = null;
+        SelectionStateModel.removeDrive();
         m.chai.expect(DriveSelectorStateService.isSelectedDrive(drive)).to.be.false;
       });
 
@@ -96,22 +102,33 @@ describe('Browser: DriveSelector', function() {
       });
 
       it('should return false if there is no selected drive and an empty object is passed', function() {
-        DriveSelectorStateService.selectedDrive = undefined;
+        SelectionStateModel.removeDrive();
         m.chai.expect(DriveSelectorStateService.isSelectedDrive({})).to.be.false;
       });
 
+      it('should return true if the drive is selected in SelectionStateModel', function() {
+        const drive = {
+          device: '/dev/disk2',
+          name: 'USB Drive',
+          size: '16GB'
+        };
+
+        SelectionStateModel.setDrive(drive);
+        m.chai.expect(DriveSelectorStateService.isSelectedDrive(drive)).to.be.true;
+      });
+
     });
 
     describe('.getSelectedDrive()', function() {
 
       it('should return undefined if no selected drive', function() {
-        DriveSelectorStateService.selectedDrive = null;
+        SelectionStateModel.removeDrive();
         const drive = DriveSelectorStateService.getSelectedDrive();
         m.chai.expect(drive).to.not.exist;
       });
 
       it('should return undefined if the selected drive is an empty object', function() {
-        DriveSelectorStateService.selectedDrive = {};
+        SelectionStateModel.setDrive({});
         const drive = DriveSelectorStateService.getSelectedDrive();
         m.chai.expect(drive).to.not.exist;
       });
diff --git a/tests/browser/models/selection-state.spec.js b/tests/browser/models/selection-state.spec.js
index b89796d0..16252bed 100644
--- a/tests/browser/models/selection-state.spec.js
+++ b/tests/browser/models/selection-state.spec.js
@@ -45,6 +45,23 @@ describe('Browser: SelectionState', function() {
 
     });
 
+    describe('given an empty object drive', function() {
+
+      beforeEach(function() {
+        SelectionStateModel.setDrive({});
+      });
+
+      describe('.getDrive()', function() {
+
+        it('should return undefined', function() {
+          const drive = SelectionStateModel.getDrive();
+          m.chai.expect(drive).to.be.undefined;
+        });
+
+      });
+
+    });
+
     describe('given a drive', function() {
 
       beforeEach(function() {