diff --git a/apps/nextjs/src/components/board/sections/gridstack/board-empty-space-context-menu.tsx b/apps/nextjs/src/components/board/sections/gridstack/board-empty-space-context-menu.tsx
index f1dfc2678..b2a31eadc 100644
--- a/apps/nextjs/src/components/board/sections/gridstack/board-empty-space-context-menu.tsx
+++ b/apps/nextjs/src/components/board/sections/gridstack/board-empty-space-context-menu.tsx
@@ -182,6 +182,7 @@ export const BoardEmptySpaceContextMenu = ({ section, refs, children, ...boxProp
       </Box>
       <Menu
         opened={menu !== null}
+        withInitialFocusPlaceholder={false}
         onChange={(opened) => {
           if (!opened) closeMenu();
         }}
@@ -194,6 +195,7 @@ export const BoardEmptySpaceContextMenu = ({ section, refs, children, ...boxProp
         </Menu.Target>
         <Menu.Dropdown>
           <Menu.Item
+            data-autofocus
             leftSection={<IconPlus size={18} />}
             onClick={() => {
               const placement = menu?.placement;
diff --git a/e2e/board-advanced-interactions.spec.ts b/e2e/board-advanced-interactions.spec.ts
index 51c06c96a..a8b40af5b 100644
--- a/e2e/board-advanced-interactions.spec.ts
+++ b/e2e/board-advanced-interactions.spec.ts
@@ -255,8 +255,6 @@ describe("Board advanced interactions", () => {
       await expect(grid).toHaveAttribute("aria-label", "Add item here");
 
       await grid.press("Shift+F10");
-      await expect(addHereMenuItem).toBeVisible();
-      await page.keyboard.press("ArrowDown");
       await expect(addHereMenuItem).toBeFocused();
       await page.keyboard.press("Enter");
       await expect(page.getByRole("dialog").filter({ hasText: "Choose item to add" })).toBeVisible();