diff --git a/ui/desktop/src/components/ChatView.tsx b/ui/desktop/src/components/ChatView.tsx
index 3815a43d..012d636c 100644
--- a/ui/desktop/src/components/ChatView.tsx
+++ b/ui/desktop/src/components/ChatView.tsx
@@ -442,8 +442,7 @@ export default function ChatView({
             isLoading={isLoading}
             onStop={onStopGoose}
             commandHistory={commandHistory}
-            value={_input}
-            onValueChange={_setInput}
+            initialValue={_input}
           />
           <BottomMenu hasMessages={hasMessages} setView={setView} />
         </div>
diff --git a/ui/desktop/src/components/Input.tsx b/ui/desktop/src/components/Input.tsx
index 4224735e..7ff7f558 100644
--- a/ui/desktop/src/components/Input.tsx
+++ b/ui/desktop/src/components/Input.tsx
@@ -8,8 +8,7 @@ interface InputProps {
   isLoading?: boolean;
   onStop?: () => void;
   commandHistory?: string[];
-  value?: string;
-  onValueChange?: (value: string) => void;
+  initialValue?: string;
 }
 
 export default function Input({
@@ -17,19 +16,17 @@ export default function Input({
   isLoading = false,
   onStop,
   commandHistory = [],
-  value: controlledValue,
-  onValueChange,
+  initialValue = '',
 }: InputProps) {
-  const [internalValue, setInternalValue] = useState('');
-  // Use controlled value if provided, otherwise use internal state
-  const value = controlledValue !== undefined ? controlledValue : internalValue;
-  const setValue = (newValue: string) => {
-    if (controlledValue !== undefined && onValueChange) {
-      onValueChange(newValue);
-    } else {
-      setInternalValue(newValue);
+  const [value, setValue] = useState(initialValue);
+
+  // Update internal value when initialValue changes
+  useEffect(() => {
+    if (initialValue) {
+      setValue(initialValue);
     }
-  };
+  }, [initialValue]);
+
   // State to track if the IME is composing (i.e., in the middle of Japanese IME input)
   const [isComposing, setIsComposing] = useState(false);
   const [historyIndex, setHistoryIndex] = useState(-1);
@@ -40,7 +37,7 @@ export default function Input({
     if (textAreaRef.current) {
       textAreaRef.current.focus();
     }
-  }, [value]);
+  }, []);
 
   const useAutosizeTextArea = (textAreaRef: HTMLTextAreaElement | null, value: string) => {
     useEffect(() => {