From 7f81d93eb1cf6a10c84d948d91c45a1fd4778060 Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Tue, 14 Jul 2026 10:03:39 -0600
Subject: [PATCH] fix(desktop): prevent menu-to-dialog UI lockups (#1839)

Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
---
 .../features/forum/ui/DeleteActionMenu.tsx    |  2 +-
 .../features/messages/ui/MessageActionBar.tsx |  2 +-
 .../relay-members/ui/RelayMembersCard.tsx     |  2 +-
 .../ui/ChannelTemplatesSettingsCard.tsx       |  2 +-
 .../src/features/sidebar/ui/WorkspaceRail.tsx |  2 +-
 .../workspaces/ui/WorkspaceSwitcher.tsx       |  6 +++-
 desktop/tests/e2e/workspace-rail.spec.ts      | 32 +++++++++++++++++++
 7 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/desktop/src/features/forum/ui/DeleteActionMenu.tsx b/desktop/src/features/forum/ui/DeleteActionMenu.tsx
index 214de1b0ec..5fbf78de81 100644
--- a/desktop/src/features/forum/ui/DeleteActionMenu.tsx
+++ b/desktop/src/features/forum/ui/DeleteActionMenu.tsx
@@ -22,7 +22,7 @@ export function DeleteActionMenu({ label, onConfirm }: DeleteActionMenuProps) {
 
   return (
     <div className="ml-auto opacity-0 transition-opacity group-hover:opacity-100">
-      <DropdownMenu>
+      <DropdownMenu modal={false}>
         <DropdownMenuTrigger asChild>
           <button
             className="rounded-md p-1 text-muted-foreground hover:bg-accent hover:text-foreground"
diff --git a/desktop/src/features/messages/ui/MessageActionBar.tsx b/desktop/src/features/messages/ui/MessageActionBar.tsx
index 72cfb3a65b..ba45bc62fb 100644
--- a/desktop/src/features/messages/ui/MessageActionBar.tsx
+++ b/desktop/src/features/messages/ui/MessageActionBar.tsx
@@ -116,7 +116,7 @@ function MoreActionsMenu({
 
   return (
     <>
-      <DropdownMenu open={open} onOpenChange={onOpenChange}>
+      <DropdownMenu modal={false} open={open} onOpenChange={onOpenChange}>
         <Tooltip>
           <TooltipTrigger asChild>
             <DropdownMenuTrigger asChild>
diff --git a/desktop/src/features/relay-members/ui/RelayMembersCard.tsx b/desktop/src/features/relay-members/ui/RelayMembersCard.tsx
index 023066b5eb..bb7a0d6404 100644
--- a/desktop/src/features/relay-members/ui/RelayMembersCard.tsx
+++ b/desktop/src/features/relay-members/ui/RelayMembersCard.tsx
@@ -116,7 +116,7 @@ function MemberRow({
       </div>
 
       {showActions ? (
-        <DropdownMenu>
+        <DropdownMenu modal={false}>
           <DropdownMenuTrigger asChild>
             <Button
               data-testid={`relay-member-actions-${member.pubkey}`}
diff --git a/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx b/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx
index 9f4c2599e2..26c80b287e 100644
--- a/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx
+++ b/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx
@@ -234,7 +234,7 @@ function TemplateRow({
         </div>
       </div>
 
-      <DropdownMenu>
+      <DropdownMenu modal={false}>
         <DropdownMenuTrigger asChild>
           <Button
             className="h-7 w-7 shrink-0 opacity-0 group-hover:opacity-100"
diff --git a/desktop/src/features/sidebar/ui/WorkspaceRail.tsx b/desktop/src/features/sidebar/ui/WorkspaceRail.tsx
index 2d6b98cbd4..0709602a91 100644
--- a/desktop/src/features/sidebar/ui/WorkspaceRail.tsx
+++ b/desktop/src/features/sidebar/ui/WorkspaceRail.tsx
@@ -99,7 +99,7 @@ function WorkspaceButton({
       : workspace.name;
 
   return (
-    <ContextMenu>
+    <ContextMenu modal={false}>
       <Tooltip>
         <TooltipTrigger asChild>
           <ContextMenuTrigger asChild>
diff --git a/desktop/src/features/workspaces/ui/WorkspaceSwitcher.tsx b/desktop/src/features/workspaces/ui/WorkspaceSwitcher.tsx
index 9d866ef015..0349448a50 100644
--- a/desktop/src/features/workspaces/ui/WorkspaceSwitcher.tsx
+++ b/desktop/src/features/workspaces/ui/WorkspaceSwitcher.tsx
@@ -281,7 +281,11 @@ export function WorkspaceSwitcher({
     ) : null;
 
   const switcherDropdown = (
-    <DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
+    <DropdownMenu
+      modal={false}
+      open={dropdownOpen}
+      onOpenChange={setDropdownOpen}
+    >
       <DropdownMenuTrigger asChild>
         {variant === "profile" ? (
           <button
diff --git a/desktop/tests/e2e/workspace-rail.spec.ts b/desktop/tests/e2e/workspace-rail.spec.ts
index fcbb9be255..b4c0f64cc1 100644
--- a/desktop/tests/e2e/workspace-rail.spec.ts
+++ b/desktop/tests/e2e/workspace-rail.spec.ts
@@ -55,6 +55,38 @@ test.describe("workspace rail", () => {
     await expect(page.getByTestId("workspace-rail-add")).toBeVisible();
   });
 
+  test("restores pointer events after dismissing workspace settings", async ({
+    page,
+  }) => {
+    await installMockBridge(page, undefined, { skipWorkspaceSeed: true });
+    await seedWorkspaces(page, [WORKSPACE_A, WORKSPACE_B], WORKSPACE_A.id);
+    await page.goto("/");
+
+    const workspaceButton = page.getByTestId(
+      `workspace-rail-button-${WORKSPACE_A.id}`,
+    );
+    await workspaceButton.click({ button: "right" });
+    await page.getByRole("menuitem", { name: "Workspace settings" }).click();
+
+    await expect(
+      page.getByRole("dialog", { name: "Edit Workspace" }),
+    ).toBeVisible();
+    await page.mouse.click(0, 0);
+
+    await expect(
+      page.getByRole("dialog", { name: "Edit Workspace" }),
+    ).toHaveCount(0);
+    await expect(page.locator("body")).not.toHaveCSS("pointer-events", "none");
+    await page.getByTestId(`workspace-rail-button-${WORKSPACE_B.id}`).click();
+    await expect
+      .poll(() =>
+        page.evaluate(() =>
+          window.localStorage.getItem("buzz-active-workspace-id"),
+        ),
+      )
+      .toBe(WORKSPACE_B.id);
+  });
+
   test("switches the active workspace on click", async ({ page }) => {
     await installMockBridge(page, undefined, { skipWorkspaceSeed: true });
     await seedWorkspaces(page, [WORKSPACE_A, WORKSPACE_B], WORKSPACE_A.id);