diff --git a/package.json b/package.json
index ca8ca26be8..16f78c08ac 100644
--- a/package.json
+++ b/package.json
@@ -110,6 +110,7 @@
           "src/components/favoriteitems.js",
           "src/components/fetchhelper.js",
           "src/components/filterdialog/filterdialog.js",
+          "src/components/focusManager.js",
           "src/components/groupedcards.js",
           "src/components/homeScreenSettings/homeScreenSettings.js",
           "src/components/homesections/homesections.js",
diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js
index 20399fb52d..b02b5fb9f8 100644
--- a/src/components/filtermenu/filtermenu.js
+++ b/src/components/filtermenu/filtermenu.js
@@ -1,5 +1,6 @@
 define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost', 'inputManager', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'userSettings', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dom, focusManager, dialogHelper, loading, appHost, inputManager, layoutManager, connectionManager, appRouter, globalize, userSettings) {
     'use strict';
+    focusManager = focusManager.default || focusManager;
 
     function onSubmit(e) {
         e.preventDefault();
diff --git a/src/components/focusManager.js b/src/components/focusManager.js
index 9c495bf952..a9ec377cce 100644
--- a/src/components/focusManager.js
+++ b/src/components/focusManager.js
@@ -1,5 +1,7 @@
-define(['dom', 'scrollManager'], function (dom, scrollManager) {
-    'use strict';
+/* eslint-disable indent */
+
+import dom from 'dom';
+import scrollManager from 'scrollManager';
 
     var scopes = [];
     function pushScope(elem) {
@@ -472,37 +474,38 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         }
     }
 
-    return {
-        autoFocus: autoFocus,
-        focus: focus,
-        focusableParent: focusableParent,
-        getFocusableElements: getFocusableElements,
-        moveLeft: function (sourceElement, options) {
-            var container = options ? options.container : null;
-            var focusableElements = options ? options.focusableElements : null;
-            nav(sourceElement, 0, container, focusableElements);
-        },
-        moveRight: function (sourceElement, options) {
-            var container = options ? options.container : null;
-            var focusableElements = options ? options.focusableElements : null;
-            nav(sourceElement, 1, container, focusableElements);
-        },
-        moveUp: function (sourceElement, options) {
-            var container = options ? options.container : null;
-            var focusableElements = options ? options.focusableElements : null;
-            nav(sourceElement, 2, container, focusableElements);
-        },
-        moveDown: function (sourceElement, options) {
-            var container = options ? options.container : null;
-            var focusableElements = options ? options.focusableElements : null;
-            nav(sourceElement, 3, container, focusableElements);
-        },
-        sendText: sendText,
-        isCurrentlyFocusable: isCurrentlyFocusable,
-        pushScope: pushScope,
-        popScope: popScope,
-        focusFirst: focusFirst,
-        focusLast: focusLast,
-        moveFocus: moveFocus
-    };
-});
+/* eslint-enable indent */
+
+export default {
+    autoFocus: autoFocus,
+    focus: focus,
+    focusableParent: focusableParent,
+    getFocusableElements: getFocusableElements,
+    moveLeft: function (sourceElement, options) {
+        var container = options ? options.container : null;
+        var focusableElements = options ? options.focusableElements : null;
+        nav(sourceElement, 0, container, focusableElements);
+    },
+    moveRight: function (sourceElement, options) {
+        var container = options ? options.container : null;
+        var focusableElements = options ? options.focusableElements : null;
+        nav(sourceElement, 1, container, focusableElements);
+    },
+    moveUp: function (sourceElement, options) {
+        var container = options ? options.container : null;
+        var focusableElements = options ? options.focusableElements : null;
+        nav(sourceElement, 2, container, focusableElements);
+    },
+    moveDown: function (sourceElement, options) {
+        var container = options ? options.container : null;
+        var focusableElements = options ? options.focusableElements : null;
+        nav(sourceElement, 3, container, focusableElements);
+    },
+    sendText: sendText,
+    isCurrentlyFocusable: isCurrentlyFocusable,
+    pushScope: pushScope,
+    popScope: popScope,
+    focusFirst: focusFirst,
+    focusLast: focusLast,
+    moveFocus: moveFocus
+};
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index 61caa9188f..71d63f82c0 100644
--- a/src/components/guide/guide.js
+++ b/src/components/guide/guide.js
@@ -4,6 +4,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     playbackManager = playbackManager.default || playbackManager;
     browser = browser.default || browser;
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     function showViewSettings(instance) {
         require(['guide-settings-dialog'], function (guideSettingsDialog) {
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index 60c458e234..38728ec6c6 100644
--- a/src/components/slideshow/slideshow.js
+++ b/src/components/slideshow/slideshow.js
@@ -6,6 +6,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
     'use strict';
 
     browser = browser.default || browser;
+    focusManager = focusManager.default || focusManager;
 
     /**
      * Name of transition event.
diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js
index f62e5bb3a4..52a7b95c40 100644
--- a/src/components/sortmenu/sortmenu.js
+++ b/src/components/sortmenu/sortmenu.js
@@ -1,6 +1,8 @@
 define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'globalize', 'userSettings', 'emby-select', 'paper-icon-button-light', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dom, focusManager, dialogHelper, loading, layoutManager, connectionManager, globalize, userSettings) {
     'use strict';
 
+    focusManager = focusManager.default || focusManager;
+
     function onSubmit(e) {
         e.preventDefault();
         return false;
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index 7df24b5da8..c42658b2d5 100644
--- a/src/components/subtitleeditor/subtitleeditor.js
+++ b/src/components/subtitleeditor/subtitleeditor.js
@@ -2,6 +2,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     'use strict';
 
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     var currentItem;
     var hasChanges;
diff --git a/src/components/tunerPicker.js b/src/components/tunerPicker.js
index 5bc9386053..4e78030a2a 100644
--- a/src/components/tunerPicker.js
+++ b/src/components/tunerPicker.js
@@ -3,6 +3,7 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
 
     browser = browser.default || browser;
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     var enableFocusTransform = !browser.slow && !browser.edge;
 
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js
index 058ba4ebb2..55425994d2 100644
--- a/src/components/viewManager/viewManager.js
+++ b/src/components/viewManager/viewManager.js
@@ -1,6 +1,8 @@
 define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], function (viewContainer, focusManager, queryString, layoutManager) {
     'use strict';
 
+    focusManager = focusManager.default || focusManager;
+
     var currentView;
     var dispatchPageEvents;
 
diff --git a/src/controllers/list.js b/src/controllers/list.js
index 68e81f05dd..afa0a60fa8 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -3,6 +3,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
 
     playbackManager = playbackManager.default || playbackManager;
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     function getInitialLiveTvQuery(instance, params) {
         var query = {
diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js
index c0cb3e557c..cc75dcdeef 100644
--- a/src/libraries/scroller.js
+++ b/src/libraries/scroller.js
@@ -2,6 +2,7 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
     'use strict';
 
     browser = browser.default || browser;
+    focusManager = focusManager.default || focusManager;
 
     /**
 * Return type of the value.
diff --git a/src/scripts/scrollHelper.js b/src/scripts/scrollHelper.js
index 82413fe9cf..8b596571b4 100644
--- a/src/scripts/scrollHelper.js
+++ b/src/scripts/scrollHelper.js
@@ -1,6 +1,8 @@
 define(['focusManager', 'dom', 'scrollStyles'], function (focusManager, dom) {
     'use strict';
 
+    focusManager = focusManager.default || focusManager;
+
     function getBoundingClientRect(elem) {
         // Support: BlackBerry 5, iOS 3 (original iPhone)
         // If we don't have gBCR, just use 0,0 rather than error
diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js
index e5fb0bcd61..87db52402d 100644
--- a/src/scripts/serverNotifications.js
+++ b/src/scripts/serverNotifications.js
@@ -2,6 +2,7 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    focusManager = focusManager.default || focusManager;
 
     var serverNotifications = {};