diff --git a/apps/client/src/widgets/react/FormList.tsx b/apps/client/src/widgets/react/FormList.tsx
index 42f43a044..87a047821 100644
--- a/apps/client/src/widgets/react/FormList.tsx
+++ b/apps/client/src/widgets/react/FormList.tsx
@@ -1,13 +1,15 @@
-import { Dropdown as BootstrapDropdown, Tooltip } from "bootstrap";
-import { ComponentChildren } from "preact";
-import Icon from "./Icon";
-import { useEffect, useMemo, useRef, useState, type CSSProperties } from "preact/compat";
 import "./FormList.css";
-import { CommandNames } from "../../components/app_context";
-import { useStaticTooltip } from "./hooks";
-import { handleRightToLeftPlacement, isMobile, openInAppHelpFromUrl } from "../../services/utils";
+
+import { Dropdown as BootstrapDropdown, Tooltip } from "bootstrap";
 import clsx from "clsx";
+import { ComponentChildren } from "preact";
+import { type CSSProperties,useEffect, useMemo, useRef, useState } from "preact/compat";
+
+import { CommandNames } from "../../components/app_context";
+import { handleRightToLeftPlacement, isMobile, openInAppHelpFromUrl } from "../../services/utils";
 import FormToggle from "./FormToggle";
+import { useStaticTooltip } from "./hooks";
+import Icon from "./Icon";
 
 interface FormListOpts {
     children: ComponentChildren;
@@ -33,7 +35,7 @@ export default function FormList({ children, onSelect, style, fullHeight, wrappe
         return () => {
             $wrapperRef.off("hide.bs.dropdown");
             dropdown.dispose();
-        }
+        };
     }, [ triggerRef, wrapperRef ]);
 
     const builtinStyles = useMemo(() => {
@@ -51,8 +53,7 @@ export default function FormList({ children, onSelect, style, fullHeight, wrappe
                 <button
                     ref={triggerRef}
                     type="button" style="display: none;"
-                    data-bs-toggle="dropdown" data-bs-display="static">
-                </button>
+                    data-bs-toggle="dropdown" data-bs-display="static" />
 
                 <div class="dropdown-menu static show" style={{
                     ...style ?? {},
@@ -199,7 +200,7 @@ export function FormListHeader({ text }: FormListHeaderOpts) {
         <li>
             <h6 className="dropdown-header">{text}</h6>
         </li>
-    )
+    );
 }
 
 export function FormDropdownDivider() {
@@ -216,21 +217,22 @@ export function FormDropdownSubmenu({ icon, title, children, dropStart, onDropdo
     const [ openOnMobile, setOpenOnMobile ] = useState(false);
 
     return (
-        <li className={clsx("dropdown-item dropdown-submenu", { "submenu-open": openOnMobile, "dropstart": dropStart })}>
-            <span
-                className="dropdown-toggle"
-                onClick={(e) => {
+        <li
+            className={clsx("dropdown-item dropdown-submenu", { "submenu-open": openOnMobile, "dropstart": dropStart })}
+            onClick={(e) => {
+                e.stopPropagation();
+
+                if (!isMobile() && onDropdownToggleClicked) {
+                    onDropdownToggleClicked();
+                }
+            }}
+        >
+            <span className="dropdown-toggle" onClick={(e) => {
+                if (isMobile()) {
                     e.stopPropagation();
-
-                    if (isMobile()) {
-                        setOpenOnMobile(!openOnMobile);
-                    }
-
-                    if (onDropdownToggleClicked) {
-                        onDropdownToggleClicked();
-                    }
-                }}
-            >
+                    setOpenOnMobile(!openOnMobile);
+                }
+            }}>
                 <Icon icon={icon} />{" "}
                 {title}
             </span>