diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index cd7f8b219d..beccf23dc4 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -118,13 +118,18 @@ import '../../assets/css/scrollstyles.scss';
             //resolve();
             // if we just called history.back(), then use a timeout to allow the history events to fire first
             setTimeout(() => {
+                dlg.dispatchEvent(new CustomEvent('close', {
+                    bubbles: false,
+                    cancelable: false
+                }));
+
                 resolve({
                     element: dlg
                 });
             }, 1);
         }
 
-        dlg.addEventListener('close', onDialogClosed);
+        dlg.addEventListener('_close', onDialogClosed);
 
         const center = !dlg.classList.contains('dialog-fixedSize');
         if (center) {
@@ -239,7 +244,7 @@ import '../../assets/css/scrollstyles.scss';
                 focusManager.popScope(dlg);
 
                 dlg.classList.add('hide');
-                dlg.dispatchEvent(new CustomEvent('close', {
+                dlg.dispatchEvent(new CustomEvent('_close', {
                     bubbles: false,
                     cancelable: false
                 }));
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 749c7cac4e..10112a8453 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -1087,9 +1087,7 @@ import template from './metadataEditor.template.html';
     }
 
     export default {
-        show: async function (itemId, serverId) {
-            const apiClient = ServerConnections.getApiClient(serverId);
-            await apiClient.getItem(apiClient.getCurrentUserId(), itemId);
+        show: function (itemId, serverId) {
             return new Promise(resolve => show(itemId, serverId, resolve));
         },