diff --git a/webapp/src/components/labThingsComponents/actionButton.vue b/webapp/src/components/labThingsComponents/actionButton.vue
index c1f59c68..1ef2c816 100644
--- a/webapp/src/components/labThingsComponents/actionButton.vue
+++ b/webapp/src/components/labThingsComponents/actionButton.vue
@@ -136,42 +136,32 @@ export default {
   watch: {
     progress: {
       handler(newval) {
-        //this.$emit("update:progress", newval);
         this.$emit("update:progress", newval);
-        //eventBus.emit("beforeUpdate:progress", newval);
       },
       deep: true,
       immediate: true // Optional: triggers immediately on component load
     },
     taskStarted: {
       handler(newval) {
-        //this.$emit("update:taskStarted", newval);
         this.$emit("update:taskStarted", newval);
-        //eventBus.emit("beforeUpdate:taskStarted", newval);
       },
       deep: true
     },
     taskRunning: {
       handler(newval) {
-        //this.$emit("update:taskRunning", newval);
         this.$emit("update:taskRunning", newval);
-        //eventBus.emit("beforeUpdate:taskRunning", newval);
       },
       deep: true
     },
     log: {
       handler(newval) {
-        //this.$emit("update:log", newval);
         this.$emit("update:log", newval);
-        //eventBus.emit("beforeUpdate:log", newval);
       },
       deep: true
     },
     taskStatus: {
       handler(newval) {
-        //this.$emit("update:taskStatus", newval);
         this.$emit("update:taskStatus", newval);
-        //eventBus.emit("beforeUpdate:taskStatus", newval);
       },
       deep: true
     }
diff --git a/webapp/src/mixins/modalMixins.js b/webapp/src/mixins/modalMixins.js
index f13dc21f..4e8ea903 100644
--- a/webapp/src/mixins/modalMixins.js
+++ b/webapp/src/mixins/modalMixins.js
@@ -7,6 +7,7 @@
  */
 
 import UIkit from "uikit";
+import { eventBus } from "@/eventBus";
 
 export default {
   methods: {
@@ -14,7 +15,7 @@ export default {
       var context = this;
 
       // Stop GPU preview to show modal
-      context.$root.$emit("globalTogglePreview", false);
+      eventBus.emit("globalTogglePreview", false);
 
       // force OK to be capitalised
       UIkit.modal.i18n = { ok: "OK", cancel: "Cancel" };
@@ -33,9 +34,9 @@ export default {
           .finally(function () {
             // Re-enable the GPU preview, if it was active before the modal
             if (context.$store.state.autoGpuPreview) {
-              context.$root.$emit("globalTogglePreview", true);
+              eventBus.emit("globalTogglePreview", true);
             }
-            context.$root.$emit("modalClosed");
+            eventBus.emit("modalClosed");
           });
       };
       return new Promise(showModal);