From 3159852e9ad9acfe9d8e502e425fa97220ec18c9 Mon Sep 17 00:00:00 2001
From: SpreadSheets600 <sohammaity239@gmail.com>
Date: Sun, 29 Mar 2026 23:42:09 +0530
Subject: [PATCH 1/2] Disable command menu auto highlight

---
 apps/web/src/components/chat/ComposerCommandMenu.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/web/src/components/chat/ComposerCommandMenu.tsx b/apps/web/src/components/chat/ComposerCommandMenu.tsx
index 7af4e6da43..c140e1349f 100644
--- a/apps/web/src/components/chat/ComposerCommandMenu.tsx
+++ b/apps/web/src/components/chat/ComposerCommandMenu.tsx
@@ -43,6 +43,8 @@ export const ComposerCommandMenu = memo(function ComposerCommandMenu(props: {
 }) {
   return (
     <Command
+      autoHighlight={false}
+      keepHighlight={false}
       mode="none"
       onItemHighlighted={(highlightedValue) => {
         props.onHighlightedItemChange(

From 81707cb57ae6597804b629a4a618bddafdc7cfad Mon Sep 17 00:00:00 2001
From: SpreadSheets600 <sohammaity239@gmail.com>
Date: Mon, 30 Mar 2026 00:07:14 +0530
Subject: [PATCH 2/2] Disable clearing command menu highlight on non-string
 values

- Keep the current highlighted item when the menu emits a non-string value
- Avoid resetting command menu highlight state during navigation
---
 apps/web/src/components/chat/ComposerCommandMenu.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/components/chat/ComposerCommandMenu.tsx b/apps/web/src/components/chat/ComposerCommandMenu.tsx
index c140e1349f..5997018ab1 100644
--- a/apps/web/src/components/chat/ComposerCommandMenu.tsx
+++ b/apps/web/src/components/chat/ComposerCommandMenu.tsx
@@ -47,9 +47,9 @@ export const ComposerCommandMenu = memo(function ComposerCommandMenu(props: {
       keepHighlight={false}
       mode="none"
       onItemHighlighted={(highlightedValue) => {
-        props.onHighlightedItemChange(
-          typeof highlightedValue === "string" ? highlightedValue : null,
-        );
+        if (typeof highlightedValue === "string") {
+          props.onHighlightedItemChange(highlightedValue);
+        }
       }}
     >
       <div className="relative overflow-hidden rounded-xl border border-border/80 bg-popover/96 shadow-lg/8 backdrop-blur-xs">