diff --git a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiToolbarWidgets.java b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiToolbarWidgets.java
index 25443f212e..8beea89c68 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiToolbarWidgets.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiToolbarWidgets.java
@@ -346,6 +346,9 @@ private void addWebToolbarButton(GuiToolbarItem toolbarItem, ToolBar toolBar) {
     imageLabel.addListener(SWT.MouseEnter, listener);
     imageLabel.addListener(SWT.MouseExit, listener);
 
+    // Also add the toolbar click handler to the image label
+    imageLabel.addListener(SWT.MouseDown, toolbarListener);
+
     // Make the entire composite clickable (image + text)
     composite.addListener(SWT.MouseDown, toolbarListener);