diff --git a/src/WebformBuilder.js b/src/WebformBuilder.js
index 30ec7ee6c9..01f60920c6 100644
--- a/src/WebformBuilder.js
+++ b/src/WebformBuilder.js
@@ -654,14 +654,16 @@ export default class WebformBuilder extends Webform {
   }
 
   addBuilderButton(info, container) {
+    let button;
     info.element = this.ce('div', {
         style: 'margin: 5px 0;'
       },
-      this.ce('span', {
+      button = this.ce('span', {
         class: `btn btn-block ${info.style || 'btn-default'}`,
-        onClick: () => this.emit(info.event)
       }, info.title)
     );
+    // Make sure it persists across refreshes.
+    this.addEventListener(button, 'click', () => this.emit(info.event), true);
     this.groups[info.key] = info;
     this.insertInOrder(info, this.groups, info.element, container);
   }