diff --git a/apps/web/__e2e__/user.test.ts b/apps/web/__e2e__/user.test.ts
index 92c5ebc8c..108d12f64 100644
--- a/apps/web/__e2e__/user.test.ts
+++ b/apps/web/__e2e__/user.test.ts
@@ -97,6 +97,7 @@ test("logged in user should not be able to open unauthorized routes", async ({
     await page.goto(route);
 
     await page.waitForURL(/\/notes/gm);
+    await page.waitForTimeout(1000);
     expect(await app.navigation.findItem("Notes")).toBeDefined();
   }
 });
diff --git a/apps/web/src/components/navigation-menu/navigation-item.tsx b/apps/web/src/components/navigation-menu/navigation-item.tsx
index b1e135a7b..356859019 100644
--- a/apps/web/src/components/navigation-menu/navigation-item.tsx
+++ b/apps/web/src/components/navigation-menu/navigation-item.tsx
@@ -116,6 +116,7 @@ function NavigationItem(
         onContextMenu={(e) => {
           if (!menuItems) return;
           e.preventDefault();
+          e.stopPropagation();
           Menu.openMenu(menuItems);
         }}
         onClick={() => {
diff --git a/apps/web/src/hooks/use-keyboard-list-navigation.ts b/apps/web/src/hooks/use-keyboard-list-navigation.ts
index 425ec766e..590491af3 100644
--- a/apps/web/src/hooks/use-keyboard-list-navigation.ts
+++ b/apps/web/src/hooks/use-keyboard-list-navigation.ts
@@ -91,7 +91,7 @@ export function useKeyboardListNavigation(
           indices.push(i);
         }
         bulkSelect(indices);
-        focusItemAt(endIndex);
+        focusItemAt(itemIndex);
       } else {
         resetSelection();
         select(itemIndex);