diff --git a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.js b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.js
index c8d33197dd..708a799ecb 100644
--- a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.js
+++ b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.js
@@ -62,7 +62,7 @@
     },
 
     _handleDeleteButton(e) {
-      const index = parseInt(e.target.getAttribute('data-index'), 10);
+      const index = parseInt(e.currentTarget.getAttribute('data-index'), 10);
       const email = this._emails[index];
       this.push('_emailsToRemove', email);
       this.splice('_emails', index, 1);