diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 997c083f85..449a610e0d 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -232,7 +232,8 @@
 
                 var dlg = paperDialogHelper.createDialog({
                     size: 'small',
-                    theme: 'a'
+                    theme: 'a',
+                    removeOnClose: true
                 });
 
                 var html = '';
@@ -262,11 +263,6 @@
                 dlg.innerHTML = html;
                 document.body.appendChild(dlg);
 
-                // Has to be assigned a z-index after the call to .open() 
-                dlg.addEventListener('iron-overlay-closed', function (e) {
-                    dlg.parentNode.removeChild(dlg);
-                });
-
                 paperDialogHelper.open(dlg);
 
                 $('form', dlg).on('submit', function () {