diff --git a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
index ed711e2c59a75..f93a870471313 100755
--- a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
+++ b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
@@ -37,7 +37,7 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement
     // because we cannot currently extend HTMLButtonElement
     this.buttonElement = this.querySelector('button, a');
 
-    this.addEventListener('click', this.executeTask);
+    this.buttonElement.addEventListener('click', this.executeTask);
 
     // Check whether we have a form
     const formSelector = this.form || 'adminForm';
@@ -67,7 +67,7 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement
       this.formElement.boxchecked.removeEventListener('change', this.onChange);
     }
 
-    this.removeEventListener('click', this.executeTask);
+    this.buttonElement.removeEventListener('click', this.executeTask);
   }
 
   onChange({ target }) {