diff --git a/lib/gui/models/store.js b/lib/gui/models/store.js
index 44ddb221..6e11ffea 100644
--- a/lib/gui/models/store.js
+++ b/lib/gui/models/store.js
@@ -101,7 +101,12 @@ const storeReducer = (state, action) => {
 
         if (_.every([
           constraints.isDriveValid(drive, image),
-          constraints.isDriveSizeRecommended(drive, image)
+          constraints.isDriveSizeRecommended(drive, image),
+
+          // We don't want to auto-select system drives,
+          // even when "unsafe mode" is enabled
+          !constraints.isSystemDrive(drive)
+
         ])) {
           return storeReducer(newState, {
             type: ACTIONS.SELECT_DRIVE,
diff --git a/tests/gui/models/drives.spec.js b/tests/gui/models/drives.spec.js
index 9cb193e5..8c7008db 100644
--- a/tests/gui/models/drives.spec.js
+++ b/tests/gui/models/drives.spec.js
@@ -248,6 +248,23 @@ describe('Browser: DrivesModel', function() {
             m.chai.expect(SelectionStateModel.hasDrive()).to.be.false;
           });
 
+          it('should not auto-select a single system drive', function() {
+            m.chai.expect(SelectionStateModel.hasDrive()).to.be.false;
+
+            DrivesModel.setDrives([
+              {
+                device: '/dev/sdb',
+                name: 'Foo',
+                size: 2000000000,
+                mountpoint: '/mnt/foo',
+                system: true,
+                protected: false
+              }
+            ]);
+
+            m.chai.expect(SelectionStateModel.hasDrive()).to.be.false;
+          });
+
         });
 
       });