diff --git a/neutrino-custom/lint.js b/neutrino-custom/lint.js
index d50300b8d..ebbfeb94c 100644
--- a/neutrino-custom/lint.js
+++ b/neutrino-custom/lint.js
@@ -83,7 +83,6 @@ module.exports = neutrino => {
                     '$',
                     '_',
                     'jQuery',
-                    'Mousetrap',
                     'React',
                     'SERVICE_DOMAIN',
                 ]
diff --git a/tests/ui/unit/init.js b/tests/ui/unit/init.js
index 843cd2573..f5c911e80 100644
--- a/tests/ui/unit/init.js
+++ b/tests/ui/unit/init.js
@@ -11,7 +11,6 @@ window.jQuery = require('jquery');
 window._ = require('lodash');
 window.React = require('react');
 require('jasmine-jquery');
-require('mousetrap');
 
 const Adapter = require('enzyme-adapter-react-16');
 const Enzyme = require('enzyme');
diff --git a/ui/entry-index.js b/ui/entry-index.js
index 73eaece15..5b78b41e3 100644
--- a/ui/entry-index.js
+++ b/ui/entry-index.js
@@ -6,7 +6,6 @@ require('font-awesome/css/font-awesome.css');
 
 // Vendor JS
 require('bootstrap/dist/js/bootstrap');
-require('mousetrap');
 require('jquery.scrollto');
 
 // Treeherder Styles
diff --git a/ui/entry-perf.js b/ui/entry-perf.js
index fc36ecb1b..39735b6c5 100644
--- a/ui/entry-perf.js
+++ b/ui/entry-perf.js
@@ -6,7 +6,6 @@ require('font-awesome/css/font-awesome.css');
 require('metrics-graphics/dist/metricsgraphics.css');
 
 // Vendor JS
-require('mousetrap');
 require('bootstrap/dist/js/bootstrap');
 // The official 'flot' NPM package is out of date, so we're using 'jquery.flot'
 // instead, which is identical to https://github.com/flot/flot
diff --git a/ui/js/controllers/main.js b/ui/js/controllers/main.js
index 590c5a9e0..eb1fe4a84 100644
--- a/ui/js/controllers/main.js
+++ b/ui/js/controllers/main.js
@@ -1,3 +1,5 @@
+import Mousetrap from 'mousetrap';
+
 import treeherderApp from '../treeherder_app';
 
 treeherderApp.controller('MainCtrl', [
diff --git a/ui/js/controllers/perf/graphs.js b/ui/js/controllers/perf/graphs.js
index c78c18b31..b41f74dc6 100644
--- a/ui/js/controllers/perf/graphs.js
+++ b/ui/js/controllers/perf/graphs.js
@@ -1,4 +1,5 @@
 import angular from 'angular';
+import Mousetrap from 'mousetrap';
 
 import perf from '../../perf';
 
diff --git a/ui/plugins/pinboard.js b/ui/plugins/pinboard.js
index 643e5497b..578c56331 100644
--- a/ui/plugins/pinboard.js
+++ b/ui/plugins/pinboard.js
@@ -1,3 +1,5 @@
+import Mousetrap from 'mousetrap';
+
 import treeherder from '../js/treeherder';
 
 treeherder.controller('PinboardCtrl', [