diff --git a/.eslintrc.js b/.eslintrc.js
index 8daed2940..2851fd803 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -100,7 +100,7 @@ module.exports = {
                 'jQuery': 'readonly',
                 // Jellyfin globals
                 'ApiClient': 'writable',
-                'events': 'writable',
+                'Events': 'writable',
                 'chrome': 'writable',
                 'DlnaProfilePage': 'writable',
                 'DashboardPage': 'writable',
diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index 76c65dce9..b10c9b880 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -309,4 +309,4 @@ import alert from '../alert';
     }
 
 /* eslint-enable indent */
-export {DirectoryBrowser};
+export default DirectoryBrowser;
diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.js b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
index 66827c4fb..72795f66f 100644
--- a/src/components/mediaLibraryCreator/mediaLibraryCreator.js
+++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
@@ -102,8 +102,8 @@ import template from './mediaLibraryCreator.template.html';
     function onAddButtonClick() {
         const page = dom.parentWithClass(this, 'dlg-librarycreator');
 
-        import('../directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 enableNetworkSharePath: true,
                 callback: function (path, networkSharePath) {
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.js b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
index 496843226..dcb418f80 100644
--- a/src/components/mediaLibraryEditor/mediaLibraryEditor.js
+++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
@@ -162,8 +162,8 @@ import template from './mediaLibraryEditor.template.html';
     }
 
     function showDirectoryBrowser(context, originalPath, networkPath) {
-        import('../directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 enableNetworkSharePath: true,
                 pathReadOnly: originalPath != null,
diff --git a/src/components/tvproviders/xmltv.js b/src/components/tvproviders/xmltv.js
index 44d08a3d7..1f782b360 100644
--- a/src/components/tvproviders/xmltv.js
+++ b/src/components/tvproviders/xmltv.js
@@ -145,8 +145,8 @@ export default function (page, providerId, options) {
     function onSelectPathClick(e) {
         const page = $(e.target).parents('.xmltvForm')[0];
 
-        import('../directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 includeFiles: true,
                 callback: function (path) {
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 92080c877..97afb430a 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -217,8 +217,8 @@ import alert from '../../components/alert';
             setDecodingCodecsVisible(page, this.value);
         });
         $('#btnSelectEncoderPath', page).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then((Module) => {
-                const picker = new Module.DirectoryBrowser();
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+                const picker = new DirectoryBrowser();
                 picker.show({
                     includeFiles: true,
                     callback: function (path) {
@@ -232,8 +232,8 @@ import alert from '../../components/alert';
             });
         });
         $('#btnSelectTranscodingTempPath', page).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then((Module) => {
-                const picker = new Module.DirectoryBrowser();
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+                const picker = new DirectoryBrowser();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -249,8 +249,8 @@ import alert from '../../components/alert';
             });
         });
         $('#btnSelectFallbackFontPath', page).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then((Module) => {
-                const picker = new Module.DirectoryBrowser();
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+                const picker = new DirectoryBrowser();
                 picker.show({
                     includeDirectories: true,
                     callback: function (path) {
diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js
index 313374c6c..e14cceefa 100644
--- a/src/controllers/dashboard/general.js
+++ b/src/controllers/dashboard/general.js
@@ -55,8 +55,8 @@ import alert from '../../components/alert';
     const brandingConfigKey = 'branding';
     export default function (view) {
         $('#btnSelectCachePath', view).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then((Module) => {
-                const picker = new Module.DirectoryBrowser();
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+                const picker = new DirectoryBrowser();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -72,8 +72,8 @@ import alert from '../../components/alert';
             });
         });
         $('#btnSelectMetadataPath', view).on('click.selectDirectory', function () {
-            import('../../components/directorybrowser/directorybrowser').then((Module) => {
-                const picker = new Module.DirectoryBrowser();
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+                const picker = new DirectoryBrowser();
                 picker.show({
                     path: $('#txtMetadataPath', view).val(),
                     networkSharePath: $('#txtMetadataNetworkPath', view).val(),
diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js
index 2c9f07dec..61ce04ad0 100644
--- a/src/controllers/dashboard/networking.js
+++ b/src/controllers/dashboard/networking.js
@@ -181,8 +181,8 @@ import alert from '../../components/alert';
             }
         });
         view.querySelector('#btnSelectCertPath').addEventListener('click', function () {
-            import('../../components/directorybrowser/directorybrowser').then((Module) => {
-                const picker = new Module.DirectoryBrowser();
+            import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+                const picker = new DirectoryBrowser();
                 picker.show({
                     includeFiles: true,
                     includeDirectories: true,
diff --git a/src/controllers/livetvsettings.js b/src/controllers/livetvsettings.js
index e30ad8768..abaa1c0a3 100644
--- a/src/controllers/livetvsettings.js
+++ b/src/controllers/livetvsettings.js
@@ -60,8 +60,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
     const page = this;
     $('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
     $('#btnSelectRecordingPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 callback: function (path) {
                     if (path) {
@@ -75,8 +75,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
         });
     });
     $('#btnSelectMovieRecordingPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 callback: function (path) {
                     if (path) {
@@ -90,8 +90,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
         });
     });
     $('#btnSelectSeriesRecordingPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 callback: function (path) {
                     if (path) {
@@ -105,8 +105,8 @@ $(document).on('pageinit', '#liveTvSettingsPage', function () {
         });
     });
     $('#btnSelectPostProcessorPath', page).on('click.selectDirectory', function () {
-        import('../components/directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 includeFiles: true,
                 callback: function (path) {
diff --git a/src/controllers/livetvtuner.js b/src/controllers/livetvtuner.js
index 4f7adb529..4d2ecb738 100644
--- a/src/controllers/livetvtuner.js
+++ b/src/controllers/livetvtuner.js
@@ -212,8 +212,8 @@ export default function (view, params) {
         });
     });
     view.querySelector('.btnSelectPath').addEventListener('click', function () {
-        import('../components/directorybrowser/directorybrowser').then((Module) => {
-            const picker = new Module.DirectoryBrowser();
+        import('../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+            const picker = new DirectoryBrowser();
             picker.show({
                 includeFiles: true,
                 callback: function (path) {
diff --git a/src/scripts/clientUtils.js b/src/scripts/clientUtils.js
index bd69140f5..b7e41a48d 100644
--- a/src/scripts/clientUtils.js
+++ b/src/scripts/clientUtils.js
@@ -7,7 +7,7 @@ import baseConfirm from '../components/confirm/confirm';
 import globalize from '../scripts/globalize';
 import * as webSettings from './settings/webSettings';
 import datetime from '../scripts/datetime';
-import { DirectoryBrowser } from '../components/directorybrowser/directorybrowser';
+import DirectoryBrowser from '../components/directorybrowser/directorybrowser';
 import dialogHelper from '../components/dialogHelper/dialogHelper';
 import itemIdentifier from '../components/itemidentifier/itemidentifier';
 
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 3b445f307..232f29a16 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -85,7 +85,7 @@ function loadCoreDictionary() {
 
 function init() {
     // This is used in plugins
-    window.events = Events;
+    window.Events = Events;
     window.TaskButton = taskButton;
 
     serverAddress().then(server => {