diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js
index 20399fb52..bd9bcb3c5 100644
--- a/src/components/filtermenu/filtermenu.js
+++ b/src/components/filtermenu/filtermenu.js
@@ -1,4 +1,7 @@
 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) {
+
+    focusManager = focusManager.default || focusManager;
+
     'use strict';
 
     function onSubmit(e) {
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index 61caa9188..71d63f82c 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 60c458e23..38728ec6c 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 f62e5bb3a..52a7b95c4 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 7df24b5da..c42658b2d 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 5bc938605..4e78030a2 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 058ba4ebb..55425994d 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/hometab.js b/src/controllers/hometab.js
index 97034d450..9610efbd3 100644
--- a/src/controllers/hometab.js
+++ b/src/controllers/hometab.js
@@ -2,6 +2,7 @@ define(['userSettings', 'loading', 'connectionManager', 'apphost', 'layoutManage
     'use strict';
 
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     function HomeTab(view, params) {
         this.view = view;
diff --git a/src/controllers/list.js b/src/controllers/list.js
index a35b7a0cf..77830bada 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 d869d8c8b..cc75dcdee 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.
@@ -697,7 +698,7 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
 
         function onFrameClick(e) {
             if (e.which === 1) {
-                var focusableParent = focusManager.default.focusableParent(e.target);
+                var focusableParent = focusManager.focusableParent(e.target);
                 if (focusableParent && focusableParent !== document.activeElement) {
                     focusableParent.focus();
                 }
diff --git a/src/scripts/scrollHelper.js b/src/scripts/scrollHelper.js
index 82413fe9c..8b596571b 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 e5fb0bcd6..87db52402 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 = {};