diff --git a/src/cli/components/InputAssist.tsx b/src/cli/components/InputAssist.tsx
index 982f955..3080d9e 100644
--- a/src/cli/components/InputAssist.tsx
+++ b/src/cli/components/InputAssist.tsx
@@ -1,4 +1,5 @@
 import { Box } from "ink";
+import { useEffect } from "react";
 import { AgentInfoBar } from "./AgentInfoBar";
 import { FileAutocomplete } from "./FileAutocomplete";
 import { SlashCommandAutocomplete } from "./SlashCommandAutocomplete";
@@ -30,8 +31,23 @@ export function InputAssist({
   agentName,
   serverUrl,
 }: InputAssistProps) {
+  const showFileAutocomplete = currentInput.includes("@");
+  const showCommandAutocomplete =
+    !showFileAutocomplete && currentInput.startsWith("/");
+
+  // Reset active state when no autocomplete is being shown
+  useEffect(() => {
+    if (!showFileAutocomplete && !showCommandAutocomplete) {
+      onAutocompleteActiveChange(false);
+    }
+  }, [
+    showFileAutocomplete,
+    showCommandAutocomplete,
+    onAutocompleteActiveChange,
+  ]);
+
   // Show file autocomplete when @ is present
-  if (currentInput.includes("@")) {
+  if (showFileAutocomplete) {
     return (
       <FileAutocomplete
         currentInput={currentInput}
@@ -43,7 +59,7 @@ export function InputAssist({
   }
 
   // Show slash command autocomplete when input starts with /
-  if (currentInput.startsWith("/")) {
+  if (showCommandAutocomplete) {
     return (
       <Box flexDirection="column">
         <SlashCommandAutocomplete