diff --git a/src/components/TaskModal.tsx b/src/components/TaskModal.tsx
index 32ada30..5c3e293 100644
--- a/src/components/TaskModal.tsx
+++ b/src/components/TaskModal.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import {
   Task, Member, Step, Message,
   updateTask, deleteTask, getMembers,
@@ -53,6 +53,7 @@ export default function TaskModal({ task, projectId, projectSlug, onClose, onUpd
   const [confirmDelete, setConfirmDelete] = useState(false);
   const [newStep, setNewStep] = useState("");
   const [newComment, setNewComment] = useState("");
+  const commentsEndRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     getMembers().then(setMembers).catch(() => {});
@@ -60,6 +61,10 @@ export default function TaskModal({ task, projectId, projectSlug, onClose, onUpd
     getMessages({ task_id: task.id }).then(setComments).catch(() => {});
   }, [task.id]);
 
+  useEffect(() => {
+    commentsEndRef.current?.scrollIntoView({ behavior: "smooth" });
+  }, [comments]);
+
   const save = async (patch: Partial<Task>) => {
     setSaving(true);
     try {
@@ -252,6 +257,7 @@ export default function TaskModal({ task, projectId, projectSlug, onClose, onUpd
                 {comments.length === 0 && (
                   <div className="text-sm text-[var(--muted)] italic">Нет комментариев</div>
                 )}
+                <div ref={commentsEndRef} />
               </div>
               <div className="flex gap-2 mt-3">
                 <input