diff --git a/web/src/lib/actions/context-menu-navigation.ts b/web/src/lib/actions/context-menu-navigation.ts
index fe8c33741286d..9f740c050a39f 100644
--- a/web/src/lib/actions/context-menu-navigation.ts
+++ b/web/src/lib/actions/context-menu-navigation.ts
@@ -28,20 +28,20 @@ interface Options {
    */
   selectedId: string | undefined;
   /**
-   * A function that is called when the selection changes.
+   * A function that is called when the selection changes, to notify consumers of the new selected id.
    */
-  selectionChanged: (node: HTMLElement | undefined, index: number | undefined) => void;
+  selectionChanged: (id: string | undefined) => void;
 }
 
 export const contextMenuNavigation: Action<HTMLElement, Options> = (node, options: Options) => {
   const getCurrentElement = () => {
     const { container, selectedId: activeId } = options;
-    return container?.querySelector(`#${activeId}`) as HTMLElement | undefined;
+    return container?.querySelector(`#${activeId}`) as HTMLElement | null;
   };
 
   const close = () => {
     const { closeDropdown, selectionChanged } = options;
-    selectionChanged(undefined, undefined);
+    selectionChanged(undefined);
     closeDropdown();
   };
 
@@ -61,8 +61,10 @@ export const contextMenuNavigation: Action<HTMLElement, Options> = (node, option
     const currentIndex = currentEl ? children.indexOf(currentEl) : -1;
     const directionFactor = (direction === 'up' ? -1 : 1) + (direction === 'up' && currentIndex === -1 ? 1 : 0);
     const newIndex = (currentIndex + directionFactor + children.length) % children.length;
+    const selectedNode = children[newIndex];
+    selectedNode?.scrollIntoView({ block: 'nearest' });
 
-    selectionChanged(children[newIndex], newIndex);
+    selectionChanged(selectedNode?.id);
   };
 
   const onEscape = (event: KeyboardEvent) => {
diff --git a/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte b/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
index 5b4c25927f019..f9abb9f7dea94 100644
--- a/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
+++ b/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
@@ -91,7 +91,7 @@
       onEscape,
       openDropdown,
       selectedId: $selectedIdStore,
-      selectionChanged: (node) => ($selectedIdStore = node?.id),
+      selectionChanged: (id) => ($selectedIdStore = id),
     }}
     bind:this={buttonContainer}
   >
diff --git a/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte b/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte
index 6bce56ed8e461..a361fcf4d1b93 100644
--- a/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte
+++ b/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte
@@ -87,7 +87,7 @@
         container: contextMenuElement,
         isOpen,
         selectedId: $selectedIdStore,
-        selectionChanged: (node) => ($selectedIdStore = node?.id),
+        selectionChanged: (id) => ($selectedIdStore = id),
       }}
     >
       {title}