diff --git a/packages/cli/src/ui/hooks/useCompletion.ts b/packages/cli/src/ui/hooks/useCompletion.ts
index 10ee4e23..1c693f71 100644
--- a/packages/cli/src/ui/hooks/useCompletion.ts
+++ b/packages/cli/src/ui/hooks/useCompletion.ts
@@ -136,7 +136,7 @@ export function useCompletion(
 
       setSuggestions(filteredSuggestions);
       setShowSuggestions(filteredSuggestions.length > 0);
-      setActiveSuggestionIndex(-1);
+      setActiveSuggestionIndex(filteredSuggestions.length > 0 ? 0 : -1);
       setVisibleStartIndex(0);
       setIsLoadingSuggestions(false);
       return;
@@ -189,7 +189,7 @@ export function useCompletion(
         if (isMounted) {
           setSuggestions(filteredSuggestions);
           setShowSuggestions(filteredSuggestions.length > 0);
-          setActiveSuggestionIndex(-1);
+          setActiveSuggestionIndex(filteredSuggestions.length > 0 ? 0 : -1);
           setVisibleStartIndex(0);
         }
       } catch (error) {