diff --git a/lib/gui/app/app.js b/lib/gui/app/app.js
index 512ddb7d..dc514d93 100644
--- a/lib/gui/app/app.js
+++ b/lib/gui/app/app.js
@@ -36,7 +36,8 @@ const windowProgress = require('./os/window-progress')
 // eslint-disable-next-line node/no-missing-require
 const analytics = require('./modules/analytics')
 const availableDrives = require('./models/available-drives')
-const driveScanner = require('./modules/drive-scanner')
+// eslint-disable-next-line node/no-missing-require
+const { scanner: driveScanner } = require('./modules/drive-scanner')
 const osDialog = require('./os/dialog')
 // eslint-disable-next-line node/no-missing-require
 const exceptionReporter = require('./modules/exception-reporter')
diff --git a/lib/gui/app/models/files.js b/lib/gui/app/models/files.js
index 6eae6ddb..b1796e18 100644
--- a/lib/gui/app/models/files.js
+++ b/lib/gui/app/models/files.js
@@ -20,7 +20,8 @@ const Bluebird = require('bluebird')
 const fs = Bluebird.promisifyAll(require('fs'))
 const path = require('path')
 
-const driveScanner = require('../modules/drive-scanner')
+// eslint-disable-next-line node/no-missing-require
+const { scanner: driveScanner } = require('../modules/drive-scanner')
 
 /* eslint-disable lodash/prefer-lodash-method */
 /* eslint-disable no-undefined */
diff --git a/lib/gui/app/modules/drive-scanner.js b/lib/gui/app/modules/drive-scanner.ts
similarity index 50%
rename from lib/gui/app/modules/drive-scanner.js
rename to lib/gui/app/modules/drive-scanner.ts
index b2e577f5..e7b5946d 100644
--- a/lib/gui/app/modules/drive-scanner.js
+++ b/lib/gui/app/modules/drive-scanner.ts
@@ -14,41 +14,33 @@
  * limitations under the License.
  */
 
-'use strict'
+import * as sdk from 'etcher-sdk';
+import { geteuid, platform } from 'process';
 
-const sdk = require('etcher-sdk')
-const process = require('process')
-
-const settings = require('../models/settings')
+import * as settings from '../models/settings';
 
 /**
  * @summary returns true if system drives should be shown
- * @function
- *
- * @returns {Boolean}
- *
- * @example
- * const shouldInclude = includeSystemDrives()
  */
-const includeSystemDrives = () => {
-  return settings.get('unsafeMode') && !settings.get('disableUnsafeMode')
+function includeSystemDrives() {
+	return settings.get('unsafeMode') && !settings.get('disableUnsafeMode');
 }
 
-const adapters = [
-  new sdk.scanner.adapters.BlockDeviceAdapter(includeSystemDrives)
-]
+const adapters: sdk.scanner.adapters.Adapter[] = [
+	new sdk.scanner.adapters.BlockDeviceAdapter(includeSystemDrives),
+];
 
 // Can't use permissions.isElevated() here as it returns a promise and we need to set
 // module.exports = scanner right now.
-// eslint-disable-next-line no-magic-numbers
-if ((process.platform !== 'linux') || (process.geteuid() === 0)) {
-  adapters.push(new sdk.scanner.adapters.UsbbootDeviceAdapter())
+if (platform !== 'linux' || geteuid() === 0) {
+	adapters.push(new sdk.scanner.adapters.UsbbootDeviceAdapter());
 }
 
-if (process.platform === 'win32') {
-  adapters.push(new sdk.scanner.adapters.DriverlessDeviceAdapter())
+if (
+	platform === 'win32' &&
+	sdk.scanner.adapters.DriverlessDeviceAdapter !== undefined
+) {
+	adapters.push(new sdk.scanner.adapters.DriverlessDeviceAdapter());
 }
 
-const scanner = new sdk.scanner.Scanner(adapters)
-
-module.exports = scanner
+export const scanner = new sdk.scanner.Scanner(adapters);
diff --git a/lib/gui/app/pages/main/Flash.tsx b/lib/gui/app/pages/main/Flash.tsx
index f51da739..5401a85b 100644
--- a/lib/gui/app/pages/main/Flash.tsx
+++ b/lib/gui/app/pages/main/Flash.tsx
@@ -28,7 +28,7 @@ import * as flashState from '../../models/flash-state';
 import * as selection from '../../models/selection-state';
 import * as store from '../../models/store';
 import * as analytics from '../../modules/analytics';
-import * as driveScanner from '../../modules/drive-scanner';
+import { scanner as driveScanner } from '../../modules/drive-scanner';
 import * as imageWriter from '../../modules/image-writer';
 import * as progressStatus from '../../modules/progress-status';
 import * as notification from '../../os/notification';