From 2c715a5b8d2de4a39c749d6bebe2dbe57462216f Mon Sep 17 00:00:00 2001
From: jan <hi@4bs3nt.com>
Date: Mon, 27 Jul 2026 19:14:00 +0200
Subject: [PATCH 1/2] fix: close actions dropdown when editing

---
 apps/web/src/components/ProjectScriptsControl.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/ProjectScriptsControl.tsx b/apps/web/src/components/ProjectScriptsControl.tsx
index 79e43f4c042..e92d8449400 100644
--- a/apps/web/src/components/ProjectScriptsControl.tsx
+++ b/apps/web/src/components/ProjectScriptsControl.tsx
@@ -138,6 +138,7 @@ export default function ProjectScriptsControl({
 }: ProjectScriptsControlProps) {
   const addScriptFormId = React.useId();
   const [editingScriptId, setEditingScriptId] = useState<string | null>(null);
+  const [actionsMenuOpen, setActionsMenuOpen] = useState(false);
   const [dialogOpen, setDialogOpen] = useState(false);
   const [name, setName] = useState("");
   const [command, setCommand] = useState("");
@@ -255,6 +256,7 @@ export default function ProjectScriptsControl({
   };
 
   const openEditDialog = (script: ProjectScript) => {
+    setActionsMenuOpen(false);
     setEditingScriptId(script.id);
     setName(script.name);
     setCommand(script.command);
@@ -349,7 +351,11 @@ export default function ProjectScriptsControl({
             <TooltipPopup side="top">Run {primaryScript.name}</TooltipPopup>
           </Tooltip>
           <GroupSeparator className="hidden @3xl/header-actions:block" />
-          <Menu highlightItemOnHover={false}>
+          <Menu
+            highlightItemOnHover={false}
+            open={actionsMenuOpen}
+            onOpenChange={setActionsMenuOpen}
+          >
             <MenuTrigger
               render={<Button size="icon-xs" variant="outline" aria-label="Script actions" />}
             >
@@ -408,7 +414,7 @@ export default function ProjectScriptsControl({
           </Menu>
         </Group>
       ) : importableScripts.length > 0 ? (
-        <Menu highlightItemOnHover={false}>
+        <Menu highlightItemOnHover={false} open={actionsMenuOpen} onOpenChange={setActionsMenuOpen}>
           <MenuTrigger render={<Button size="xs" variant="outline" aria-label="Project actions" />}>
             <PlusIcon className="size-3.5" />
             <span className="sr-only @3xl/header-actions:not-sr-only @3xl/header-actions:ml-0.5">

From 31e5c657ac9a0f0dc8d5408207bac5697b189094 Mon Sep 17 00:00:00 2001
From: jan <hi@4bs3nt.com>
Date: Mon, 27 Jul 2026 19:36:17 +0200
Subject: [PATCH 2/2] fix: isolate project actions menu state

---
 .../src/components/ProjectScriptsControl.tsx    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/components/ProjectScriptsControl.tsx b/apps/web/src/components/ProjectScriptsControl.tsx
index e92d8449400..3a4e59edbe8 100644
--- a/apps/web/src/components/ProjectScriptsControl.tsx
+++ b/apps/web/src/components/ProjectScriptsControl.tsx
@@ -138,7 +138,10 @@ export default function ProjectScriptsControl({
 }: ProjectScriptsControlProps) {
   const addScriptFormId = React.useId();
   const [editingScriptId, setEditingScriptId] = useState<string | null>(null);
-  const [actionsMenuOpen, setActionsMenuOpen] = useState(false);
+  const [actionsMenuOpen, setActionsMenuOpen] = useState({
+    scripts: false,
+    imports: false,
+  });
   const [dialogOpen, setDialogOpen] = useState(false);
   const [name, setName] = useState("");
   const [command, setCommand] = useState("");
@@ -256,7 +259,7 @@ export default function ProjectScriptsControl({
   };
 
   const openEditDialog = (script: ProjectScript) => {
-    setActionsMenuOpen(false);
+    setActionsMenuOpen({ scripts: false, imports: false });
     setEditingScriptId(script.id);
     setName(script.name);
     setCommand(script.command);
@@ -353,8 +356,8 @@ export default function ProjectScriptsControl({
           <GroupSeparator className="hidden @3xl/header-actions:block" />
           <Menu
             highlightItemOnHover={false}
-            open={actionsMenuOpen}
-            onOpenChange={setActionsMenuOpen}
+            open={actionsMenuOpen.scripts}
+            onOpenChange={(open) => setActionsMenuOpen({ scripts: open, imports: false })}
           >
             <MenuTrigger
               render={<Button size="icon-xs" variant="outline" aria-label="Script actions" />}
@@ -414,7 +417,11 @@ export default function ProjectScriptsControl({
           </Menu>
         </Group>
       ) : importableScripts.length > 0 ? (
-        <Menu highlightItemOnHover={false} open={actionsMenuOpen} onOpenChange={setActionsMenuOpen}>
+        <Menu
+          highlightItemOnHover={false}
+          open={actionsMenuOpen.imports}
+          onOpenChange={(open) => setActionsMenuOpen({ scripts: false, imports: open })}
+        >
           <MenuTrigger render={<Button size="xs" variant="outline" aria-label="Project actions" />}>
             <PlusIcon className="size-3.5" />
             <span className="sr-only @3xl/header-actions:not-sr-only @3xl/header-actions:ml-0.5">