diff --git a/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java b/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java
index a2a0a34e..8198cd69 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java
@@ -1,6 +1,7 @@
 package io.xpipe.app.fxcomps.augment;
 
 import io.xpipe.app.fxcomps.CompStructure;
+import javafx.event.ActionEvent;
 import javafx.geometry.Side;
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.ContextMenu;
@@ -75,7 +76,11 @@ public class ContextMenuAugment<S extends CompStructure<?>> implements Augment<S
         });
 
         if (r instanceof ButtonBase buttonBase && keyEventCheck == null) {
-            buttonBase.setOnAction(event -> {
+            buttonBase.addEventFilter(ActionEvent.ACTION, event -> {
+                if (buttonBase.getOnAction() != null) {
+                    return;
+                }
+
                 if (!hide.get()) {
                     var cm = contextMenu.get();
                     if (cm != null) {