diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx
index 3627a6b4..472f6649 100644
--- a/web/components/feed/feed-items.tsx
+++ b/web/components/feed/feed-items.tsx
@@ -299,7 +299,7 @@ export function CommentInput(props: {
                   onChange={(e) => setComment(e.target.value)}
                   className="textarea textarea-bordered w-full resize-none"
                   placeholder="Add a comment..."
-                  autoFocus={true}
+                  autoFocus={focused}
                   rows={answerOutcome == undefined || focused ? 3 : 1}
                   onFocus={() => setFocused(true)}
                   onBlur={() => !comment && setFocused(false)}