diff --git a/webapp/src/sui.tsx b/webapp/src/sui.tsx
index 39062c890b5a..aab20ade1885 100644
--- a/webapp/src/sui.tsx
+++ b/webapp/src/sui.tsx
@@ -292,7 +292,9 @@ export class DropdownMenu extends UIElement<DropdownProps, DropdownState> {
             if (activeChild) {
                 activeChild.click();
             } else {
-                this.toggle(true);
+                if (!this.props.onClick || this.props.onClick()) {
+                    this.toggle(true);
+                }
             }
         } else if (activeElementIndex === children.length - 1 && !e.shiftKey && charCode === core.TAB_KEY) {
             if (activeChild) {