diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js
index 69caf9cbce..6d1c3c24f5 100644
--- a/src/components/itemContextMenu.js
+++ b/src/components/itemContextMenu.js
@@ -339,7 +339,8 @@ function executeCommand(item, id, options) {
                 break;
             case 'addtoplaylist':
                 import('./playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
-                    new PlaylistEditor({
+                    const playlistEditor = new PlaylistEditor();
+                    playlistEditor.show({
                         items: [itemId],
                         serverId: serverId
                     }).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
index 48cbce0e1f..d69c7b33bd 100644
--- a/src/components/multiSelect/multiSelect.js
+++ b/src/components/multiSelect/multiSelect.js
@@ -6,7 +6,6 @@ import dom from '../../scripts/dom';
 import './multiSelect.scss';
 import ServerConnections from '../ServerConnections';
 import alert from '../alert';
-import PlaylistEditor from '../playlisteditor/playlisteditor';
 import confirm from '../confirm/confirm';
 import itemHelper from '../itemHelper';
 import datetime from '../../scripts/datetime';
@@ -269,9 +268,16 @@ function showMenuForSelectedItems(e) {
                                 dispatchNeedsRefresh();
                                 break;
                             case 'playlist':
-                                new PlaylistEditor({
-                                    items: items,
-                                    serverId: serverId
+                                import('../playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
+                                    const playlistEditor = new PlaylistEditor();
+                                    playlistEditor.show({
+                                        items: items,
+                                        serverId: serverId
+                                    }).catch(() => {
+                                        // Dialog closed
+                                    });
+                                }).catch(err => {
+                                    console.error('[AddToPlaylist] failed to load playlist editor', err);
                                 });
                                 hideSelections();
                                 dispatchNeedsRefresh();
diff --git a/src/components/playlisteditor/playlisteditor.js b/src/components/playlisteditor/playlisteditor.js
index ee7cd2b41a..625135a472 100644
--- a/src/components/playlisteditor/playlisteditor.js
+++ b/src/components/playlisteditor/playlisteditor.js
@@ -222,7 +222,7 @@ function centerFocus(elem, horiz, on) {
 }
 
 export class PlaylistEditor {
-    constructor(options) {
+    show(options) {
         const items = options.items || {};
         currentServerId = options.serverId;
 
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 1120e03c02..9406e16e2b 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -704,15 +704,20 @@ export default function () {
         import('../playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
             getSaveablePlaylistItems().then(function (items) {
                 const serverId = items.length ? items[0].ServerId : ApiClient.serverId();
-                new PlaylistEditor({
+                const playlistEditor = new PlaylistEditor();
+                playlistEditor.show({
                     items: items.map(function (i) {
                         return i.Id;
                     }),
                     serverId: serverId,
                     enableAddToPlayQueue: false,
                     defaultValue: 'new'
+                }).catch(() => {
+                    // Dialog closed
                 });
             });
+        }).catch(err => {
+            console.error('[savePlaylist] failed to load playlist editor', err);
         });
     }
 
diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js
index 03418f3e21..cadb8cc20e 100644
--- a/src/components/shortcuts.js
+++ b/src/components/shortcuts.js
@@ -282,11 +282,15 @@ function executeAction(card, target, action) {
 
 function addToPlaylist(item) {
     import('./playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
-        new PlaylistEditor().show({
+        const playlistEditor = new PlaylistEditor();
+        playlistEditor.show({
             items: [item.Id],
             serverId: item.ServerId
-
+        }).catch(() => {
+            // Dialog closed
         });
+    }).catch(err => {
+        console.error('[addToPlaylist] failed to load playlist editor', err);
     });
 }
 
diff --git a/src/controllers/list.js b/src/controllers/list.js
index c5497be276..69b713e150 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -401,10 +401,15 @@ function onNewItemClick() {
     const instance = this;
 
     import('../components/playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
-        new PlaylistEditor({
+        const playlistEditor = new PlaylistEditor();
+        playlistEditor.show({
             items: [],
             serverId: instance.params.serverId
+        }).catch(() => {
+            // Dialog closed
         });
+    }).catch(err => {
+        console.error('[onNewItemClick] failed to load playlist editor', err);
     });
 }
 
diff --git a/src/scripts/playlists.js b/src/scripts/playlists.js
index b8b7380b57..33963bf8a2 100644
--- a/src/scripts/playlists.js
+++ b/src/scripts/playlists.js
@@ -187,10 +187,15 @@ export default function (view) {
     view.querySelector('.btnNewPlaylist').addEventListener('click', function () {
         import('../components/playlisteditor/playlisteditor').then(({ default: PlaylistEditor }) => {
             const serverId = ApiClient.serverInfo().Id;
-            new PlaylistEditor({
+            const playlistEditor = new PlaylistEditor();
+            playlistEditor.show({
                 items: [],
                 serverId: serverId
+            }).catch(() => {
+                // Dialog closed
             });
+        }).catch(err => {
+            console.error('[btnNewPlaylist] failed to load playlist editor', err);
         });
     });
     onViewStyleChange();