diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
index 802c70ef..51f29225 100644
--- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
+++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
@@ -232,8 +232,8 @@ export class ArduinoFrontendContribution implements TabBarToolbarContribution, C
         registry.registerCommand(ArduinoCommands.SHOW_OPEN_CONTEXT_MENU, {
             isVisible: widget => this.isArduinoToolbar(widget),
             isEnabled: widget => this.isArduinoToolbar(widget),
-            execute: async (widget: Widget, event: React.MouseEvent<HTMLElement>) => {
-                const el = (event.target as HTMLElement).parentElement;
+            execute: async (widget: Widget, target: EventTarget) => {
+                const el = (target as HTMLElement).parentElement;
                 if (el) {
                     this.contextMenuRenderer.render(ArduinoToolbarContextMenu.OPEN_SKETCH_PATH, {
                         x: el.getBoundingClientRect().left,
diff --git a/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx b/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx
index a91399b6..cbeb3dd3 100644
--- a/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx
+++ b/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx
@@ -103,7 +103,7 @@ export class ArduinoToolbar extends ReactWidget {
     protected executeCommand = (e: React.MouseEvent<HTMLElement>) => {
         const item = this.items.get(e.currentTarget.id);
         if (TabBarToolbarItem.is(item)) {
-            this.commands.executeCommand(item.command, this, e);
+            this.commands.executeCommand(item.command, this, e.target);
         }
     }
 }