diff --git a/package.json b/package.json
index b3b5298499..a88fa394b2 100644
--- a/package.json
+++ b/package.json
@@ -110,6 +110,7 @@
           "src/components/playback/playmethodhelper.js",
           "src/components/playback/remotecontrolautoplay.js",
           "src/components/playback/volumeosd.js",
+          "src/components/prompt/prompt.js",
           "src/components/playmenu.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 52f030cd23..2f7bfc951e 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -212,7 +212,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     function addElementToList(source, sortCallback) {
         require(['prompt'], function (prompt) {
 
-            prompt({
+            prompt.default({
                 label: 'Value:'
             }).then(function (text) {
                 var list = dom.parentWithClass(source, 'editableListviewContainer').querySelector('.paperList');
diff --git a/src/components/prompt/prompt.js b/src/components/prompt/prompt.js
index a76083cf04..f3bf72f8f2 100644
--- a/src/components/prompt/prompt.js
+++ b/src/components/prompt/prompt.js
@@ -1,12 +1,24 @@
-define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'dom', 'require', 'material-icons', 'emby-button', 'paper-icon-button-light', 'emby-input', 'formDialogStyle'], function(browser, dialogHelper, layoutManager, scrollHelper, globalize, dom, require) {
-    'use strict';
+import browser from 'browser';
+import dialogHelper from 'dialogHelper';
+import layoutManager from 'layoutManager';
+import scrollHelper from 'scrollHelper';
+import globalize from 'globalize';
+import dom from 'dom';
+import 'material-icons';
+import 'emby-button';
+import 'paper-icon-button-light';
+import 'emby-input';
+import 'formDialogStyle';
+
+/* eslint-disable indent */
+export default (() => {
 
     function replaceAll(str, find, replace) {
         return str.split(find).join(replace);
     }
 
     function setInputProperties(dlg, options) {
-        var txtInput = dlg.querySelector('#txtInput');
+        const txtInput = dlg.querySelector('#txtInput');
 
         if (txtInput.label) {
             txtInput.label(options.label || '');
@@ -17,7 +29,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
     }
 
     function showDialog(options, template) {
-        var dialogOptions = {
+        const dialogOptions = {
             removeOnClose: true,
             scrollY: false
         };
@@ -26,7 +38,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             dialogOptions.size = 'fullscreen';
         }
 
-        var dlg = dialogHelper.createDialog(dialogOptions);
+        const dlg = dialogHelper.createDialog(dialogOptions);
 
         dlg.classList.add('formDialog');
 
@@ -39,7 +51,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             dlg.classList.add('dialog-fullscreen-lowres');
         }
 
-        dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+        dlg.querySelector('.btnCancel').addEventListener('click', () => {
             dialogHelper.close(dlg);
         });
 
@@ -53,16 +65,16 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
 
         setInputProperties(dlg, options);
 
-        var submitValue;
+        let submitValue;
 
-        dlg.querySelector('form').addEventListener('submit', function (e) {
+        dlg.querySelector('form').addEventListener('submit', e => {
 
             submitValue = dlg.querySelector('#txtInput').value;
             e.preventDefault();
             e.stopPropagation();
 
             // Important, don't close the dialog until after the form has completed submitting, or it will cause an error in Chrome
-            setTimeout(function () {
+            setTimeout(() => {
                 dialogHelper.close(dlg);
             }, 300);
 
@@ -71,9 +83,9 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
 
         dlg.querySelector('.submitText').innerHTML = options.confirmText || globalize.translate('ButtonOk');
 
-        dlg.style.minWidth = (Math.min(400, dom.getWindowSize().innerWidth - 50)) + 'px';
+        dlg.style.minWidth = `${Math.min(400, dom.getWindowSize().innerWidth - 50)}px`;
 
-        return dialogHelper.open(dlg).then(function () {
+        return dialogHelper.open(dlg).then(() => {
             if (layoutManager.tv) {
                 scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
             }
@@ -87,7 +99,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
     }
 
     if ((browser.tv || browser.xboxOne) && window.confirm) {
-        return function (options) {
+        return options => {
             if (typeof options === 'string') {
                 options = {
                     label: '',
@@ -95,8 +107,8 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
                 };
             }
 
-            var label = replaceAll(options.label || '', '<br/>', '\n');
-            var result = prompt(label, options.text || '');
+            const label = replaceAll(options.label || '', '<br/>', '\n');
+            const result = prompt(label, options.text || '');
 
             if (result) {
                 return Promise.resolve(result);
@@ -105,9 +117,9 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             }
         };
     } else {
-        return function (options) {
-            return new Promise(function (resolve, reject) {
-                require(['text!./prompt.template.html'], function (template) {
+        return options => {
+            return new Promise((resolve, reject) => {
+                import('text!./prompt.template.html').then(({default: template}) => {
                     if (typeof options === 'string') {
                         options = {
                             title: '',
@@ -119,4 +131,5 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             });
         };
     }
-});
+})();
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/apikeys.js b/src/controllers/dashboard/apikeys.js
index dc17d43c5a..d3e824ed50 100644
--- a/src/controllers/dashboard/apikeys.js
+++ b/src/controllers/dashboard/apikeys.js
@@ -47,7 +47,7 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button']
 
     function showNewKeyPrompt(page) {
         require(['prompt'], function (prompt) {
-            prompt({
+            prompt.default({
                 title: globalize.translate('HeaderNewApiKey'),
                 label: globalize.translate('LabelAppName'),
                 description: globalize.translate('LabelAppNameExample')
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index dcd56921ea..116c8574fe 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -34,7 +34,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
 
     function showSendMessageForm(btn, session) {
         require(['prompt'], function (prompt) {
-            prompt({
+            prompt.default({
                 title: globalize.translate('HeaderSendMessage'),
                 label: globalize.translate('LabelMessageText'),
                 confirmText: globalize.translate('ButtonSend')
diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js
index 2d0d45438d..bfa4ab1b30 100644
--- a/src/controllers/dashboard/mediaLibrary.js
+++ b/src/controllers/dashboard/mediaLibrary.js
@@ -66,7 +66,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
 
     function renameVirtualFolder(page, virtualFolder) {
         require(['prompt'], function (prompt) {
-            prompt({
+            prompt.default({
                 label: globalize.translate('LabelNewName'),
                 confirmText: globalize.translate('ButtonRename')
             }).then(function (newName) {
diff --git a/src/controllers/dashboard/users/userparentalcontrol.js b/src/controllers/dashboard/users/userparentalcontrol.js
index e8255512d6..f5d4e70afd 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.js
+++ b/src/controllers/dashboard/users/userparentalcontrol.js
@@ -225,7 +225,7 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
 
     function showBlockedTagPopup(page) {
         require(['prompt'], function (prompt) {
-            prompt({
+            prompt.default({
                 label: globalize.translate('LabelTag')
             }).then(function (value) {
                 var tags = getBlockedTagsFromPage(page);