diff --git a/src/signals/uiEvents/toolbarImage.ts b/src/signals/uiEvents/toolbarImage.ts
index e2bd269810..21ce5b10ef 100644
--- a/src/signals/uiEvents/toolbarImage.ts
+++ b/src/signals/uiEvents/toolbarImage.ts
@@ -17,17 +17,27 @@ const events = Object.values(ToolbarImageButtonNames).reduce(
   },
 );
 
+const effectsCleanups = Object.values(ToolbarImageButtonNames).reduce(
+  (acc, buttonName) => {
+    acc[buttonName] = undefined;
+    return acc;
+  },
+  {} as {
+    [key in ToolbarImageButtonNames]: (() => void) | undefined;
+  },
+);
+
 export const eventsHandlers = Object.values(ToolbarImageButtonNames).reduce(
   (acc, buttonName) => {
     acc[buttonName] = {
-      onClick: (callback: () => void) => {
-        effect(() => {
+      onClick: (callback: MouseEventHandler<HTMLButtonElement>) => {
+        if (effectsCleanups[buttonName]) {
+          effectsCleanups[buttonName]();
+        }
+        effectsCleanups[buttonName] = effect(() => {
           if (events[buttonName].value) {
-            callback();
-            return () => {
-              //console.log("Toolbar Image effect event handler cleanup");
-              events[buttonName].value = undefined;
-            };
+            callback(events[buttonName].value);
+            events[buttonName].value = undefined;
           }
         });
       },
@@ -36,7 +46,7 @@ export const eventsHandlers = Object.values(ToolbarImageButtonNames).reduce(
   },
   {} as {
     [key in ToolbarImageButtonNames]: {
-      onClick: (callback: () => void) => void;
+      onClick: (callback: MouseEventHandler<HTMLButtonElement>) => void;
     };
   },
 );
diff --git a/src/signals/uiEvents/toolbarMain.ts b/src/signals/uiEvents/toolbarMain.ts
index d56a013298..09b57e067d 100644
--- a/src/signals/uiEvents/toolbarMain.ts
+++ b/src/signals/uiEvents/toolbarMain.ts
@@ -16,22 +16,27 @@ const events = Object.values(ToolbarMainButtonNames).reduce(
     >;
   },
 );
+const effectsCleanups = Object.values(ToolbarMainButtonNames).reduce(
+  (acc, buttonName) => {
+    acc[buttonName] = undefined;
+    return acc;
+  },
+  {} as {
+    [key in ToolbarMainButtonNames]: (() => void) | undefined;
+  },
+);
 
 export const eventsHandlers = Object.values(ToolbarMainButtonNames).reduce(
   (acc, buttonName) => {
     acc[buttonName] = {
       onClick: (callback: MouseEventHandler<HTMLButtonElement>) => {
-        effect(() => {
+        if (effectsCleanups[buttonName]) {
+          effectsCleanups[buttonName]();
+        }
+        effectsCleanups[buttonName] = effect(() => {
           if (events[buttonName].value) {
             callback(events[buttonName].value);
-            return () => {
-              //console.log("Toolbar Main effect event handler cleanup");
-              events[buttonName].value = undefined;
-            };
-            return () => {
-              //console.log("Toolbar Image effect event handler cleanup");
-              events[buttonName].value = undefined;
-            };
+            events[buttonName].value = undefined;
           }
         });
       },