diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js
index 20399fb52d..03a1706fb5 100644
--- a/src/components/filtermenu/filtermenu.js
+++ b/src/components/filtermenu/filtermenu.js
@@ -1,6 +1,8 @@
 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';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     function onSubmit(e) {
         e.preventDefault();
         return false;
diff --git a/src/components/guide/guide-settings.js b/src/components/guide/guide-settings.js
index c3ba49f283..437dd5fcec 100644
--- a/src/components/guide/guide-settings.js
+++ b/src/components/guide/guide-settings.js
@@ -1,6 +1,8 @@
 define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectionManager', 'require', 'loading', 'scrollHelper', 'emby-checkbox', 'emby-radio', 'css!./../formdialog', 'material-icons'], function (dialogHelper, globalize, userSettings, layoutManager, connectionManager, require, loading, scrollHelper) {
     'use strict';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     function saveCategories(context, options) {
         var categories = [];
 
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index 61caa9188f..6057375ec2 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;
+    layoutManager = layoutManager.default || layoutManager;
 
     function showViewSettings(instance) {
         require(['guide-settings-dialog'], function (guideSettingsDialog) {
diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js
index ca5c475829..fb452fa8a4 100644
--- a/src/components/recordingcreator/recordingcreator.js
+++ b/src/components/recordingcreator/recordingcreator.js
@@ -1,6 +1,8 @@
 define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'datetime', 'imageLoader', 'recordingFields', 'events', 'emby-checkbox', 'emby-button', 'emby-collapse', 'emby-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, datetime, imageLoader, recordingFields, events) {
     'use strict';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     var currentDialog;
     var closeAction;
     var currentRecordingFields;
diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js
index 2086129a9e..2ac8c826e1 100644
--- a/src/components/recordingcreator/recordingeditor.js
+++ b/src/components/recordingcreator/recordingeditor.js
@@ -2,6 +2,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     'use strict';
 
     loading = loading.default || loading;
+    layoutManager = layoutManager.default || layoutManager;
 
     var currentDialog;
     var recordingDeleted = false;
diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js
index b115e273e6..b5d8eee82b 100644
--- a/src/components/recordingcreator/seriesrecordingeditor.js
+++ b/src/components/recordingcreator/seriesrecordingeditor.js
@@ -2,6 +2,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     'use strict';
 
     loading = loading.default || loading;
+    layoutManager = layoutManager.default || layoutManager;
 
     var currentDialog;
     var recordingUpdated = false;
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index b5ac4c9a8b..c6c2a123b4 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -2,6 +2,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    layoutManager = layoutManager.default || layoutManager;
 
     var showMuteButton = true;
     var showVolumeSlider = true;
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index 60c458e234..e29a3c8fb9 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;
+    layoutManager = layoutManager.default || layoutManager;
 
     /**
      * Name of transition event.
diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js
index f62e5bb3a4..56f33001e7 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';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     function onSubmit(e) {
         e.preventDefault();
         return false;
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index 7df24b5da8..093bbe7a4d 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;
+    layoutManager = layoutManager.default || layoutManager;
 
     var currentItem;
     var hasChanges;
diff --git a/src/components/subtitlesync/subtitlesync.js b/src/components/subtitlesync/subtitlesync.js
index 203d88535f..4433c8d958 100644
--- a/src/components/subtitlesync/subtitlesync.js
+++ b/src/components/subtitlesync/subtitlesync.js
@@ -2,6 +2,7 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    layoutManager = layoutManager.default || layoutManager;
 
     var player;
     var subtitleSyncSlider;
diff --git a/src/components/tabbedview/tabbedview.js b/src/components/tabbedview/tabbedview.js
index 8bd3afd372..c8c0f232be 100644
--- a/src/components/tabbedview/tabbedview.js
+++ b/src/components/tabbedview/tabbedview.js
@@ -1,6 +1,8 @@
 define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (backdrop, mainTabsManager, layoutManager) {
     'use strict';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     function onViewDestroy(e) {
         var tabControllers = this.tabControllers;
 
diff --git a/src/components/tunerPicker.js b/src/components/tunerPicker.js
index 5bc9386053..6391a84e3a 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;
+    layoutManager = layoutManager.default || layoutManager;
 
     var enableFocusTransform = !browser.slow && !browser.edge;
 
diff --git a/src/components/upnextdialog/upnextdialog.js b/src/components/upnextdialog/upnextdialog.js
index 5eb2a2ffcc..fdf7c056f5 100644
--- a/src/components/upnextdialog/upnextdialog.js
+++ b/src/components/upnextdialog/upnextdialog.js
@@ -2,6 +2,7 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    layoutManager = layoutManager.default || layoutManager;
 
     var transitionEndEventName = dom.whichTransitionEvent();
 
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js
index 058ba4ebb2..8c9840fec3 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';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     var currentView;
     var dispatchPageEvents;
 
diff --git a/src/components/viewSettings/viewSettings.js b/src/components/viewSettings/viewSettings.js
index 67abc25a9c..9356f991fc 100644
--- a/src/components/viewSettings/viewSettings.js
+++ b/src/components/viewSettings/viewSettings.js
@@ -1,6 +1,8 @@
 define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'userSettings', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dialogHelper, loading, appHost, layoutManager, connectionManager, appRouter, globalize, userSettings) {
     'use strict';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     function onSubmit(e) {
         e.preventDefault();
         return false;
diff --git a/src/controllers/list.js b/src/controllers/list.js
index 68e81f05dd..3cfa7ce281 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;
+    layoutManager = layoutManager.default || layoutManager;
 
     function getInitialLiveTvQuery(instance, params) {
         var query = {
diff --git a/src/controllers/livetv/livetvrecordings.js b/src/controllers/livetv/livetvrecordings.js
index b0259bc89b..ab92770336 100644
--- a/src/controllers/livetv/livetvrecordings.js
+++ b/src/controllers/livetv/livetvrecordings.js
@@ -2,6 +2,7 @@ define(['layoutManager', 'loading', 'cardBuilder', 'apphost', 'imageLoader', 'sc
     'use strict';
 
     loading = loading.default || loading;
+    layoutManager = layoutManager.default || layoutManager;
 
     function renderRecordings(elem, recordings, cardOptions, scrollX) {
         if (!elem) {
diff --git a/src/controllers/livetv/livetvschedule.js b/src/controllers/livetv/livetvschedule.js
index 4427bef5d1..a7c3f56279 100644
--- a/src/controllers/livetv/livetvschedule.js
+++ b/src/controllers/livetv/livetvschedule.js
@@ -2,6 +2,7 @@ define(['layoutManager', 'cardBuilder', 'apphost', 'imageLoader', 'loading', 'sc
     'use strict';
 
     loading = loading.default || loading;
+    layoutManager = layoutManager.default || layoutManager;
 
     function enableScrollX() {
         return !layoutManager.desktop;
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 79d9aac6e9..b3adc4fa85 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -2,6 +2,7 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
     'use strict';
 
     loading = loading.default || loading;
+    layoutManager = layoutManager.default || layoutManager;
 
     function enableScrollX() {
         return !layoutManager.desktop;
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index 82ab4d4d4b..716b9b94cd 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -3,6 +3,7 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
 
     loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
+    layoutManager = layoutManager.default || layoutManager;
 
     return function (view, params, tabContent) {
         function getPageData() {
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index ade9dc4b89..48f9fa8f5d 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -3,6 +3,7 @@ define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser',
 
     loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
+    layoutManager = layoutManager.default || layoutManager;
 
     return function (view, params, tabContent, options) {
         function onViewStyleChange() {
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index a633d654cd..1d50f85919 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -2,6 +2,7 @@ define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu'
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    layoutManager = layoutManager.default || layoutManager;
 
     function enableScrollX() {
         return !layoutManager.desktop;
diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js
index 8d9fe8d090..7dc3b577da 100644
--- a/src/controllers/movies/movietrailers.js
+++ b/src/controllers/movies/movietrailers.js
@@ -3,6 +3,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
 
     loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
+    layoutManager = layoutManager.default || layoutManager;
 
     return function (view, params, tabContent) {
         function getPageData(context) {
diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js
index c0cb3e557c..9b441da012 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;
+    layoutManager = layoutManager.default || layoutManager;
 
     /**
 * Return type of the value.
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index bbe01276ba..773804f84b 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -3,6 +3,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
 
     playbackManager = playbackManager.default || playbackManager;
     browser = browser.default || browser;
+    layoutManager = layoutManager.default || layoutManager;
 
     function renderHeader() {
         var html = '';
diff --git a/src/scripts/livetvcomponents.js b/src/scripts/livetvcomponents.js
index fd1b48d0eb..2f4e71642c 100644
--- a/src/scripts/livetvcomponents.js
+++ b/src/scripts/livetvcomponents.js
@@ -1,6 +1,8 @@
 define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layoutManager, datetime, cardBuilder, appHost) {
     'use strict';
 
+    layoutManager = layoutManager.default || layoutManager;
+
     function enableScrollX() {
         return !layoutManager.desktop;
     }
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 87402635f5..ab44d03834 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -350,6 +350,7 @@ function initClient() {
     }
 
     function getLayoutManager(layoutManager, appHost) {
+        layoutManager = layoutManager.default || layoutManager;
         if (appHost.getDefaultLayout) {
             layoutManager.defaultLayout = appHost.getDefaultLayout();
         }