diff --git a/site/src/pages/AgentsPage/components/DiffViewer/CommentableDiffViewer.tsx b/site/src/pages/AgentsPage/components/DiffViewer/CommentableDiffViewer.tsx
index 8858b4775d..c2caaf3ea0 100644
--- a/site/src/pages/AgentsPage/components/DiffViewer/CommentableDiffViewer.tsx
+++ b/site/src/pages/AgentsPage/components/DiffViewer/CommentableDiffViewer.tsx
@@ -294,6 +294,7 @@ export const CommentableDiffViewer: FC<CommentableDiffViewerProps> = ({
 		if (text.trim()) {
 			chatInputRef?.current?.insertText(text);
 		}
+		chatInputRef?.current?.focus();
 		setActiveCommentBox(null);
 	};