diff --git a/src/components/ModalCalendar.tsx b/src/components/ModalCalendar.tsx
index 3f1e596..891e100 100644
--- a/src/components/ModalCalendar.tsx
+++ b/src/components/ModalCalendar.tsx
@@ -199,4 +199,6 @@ const ModalCalendar: FunctionComponent<ModalCalendarProps> = ({ isOpen, setIsOpe
   );
 };
 
+ModalCalendar.displayName = "AHModalCalendar";
+
 export default ModalCalendar;
diff --git a/src/pages/profile_tasks.dto.ts b/src/pages/profile_tasks.dto.ts
index 08b55de..40d8d52 100644
--- a/src/pages/profile_tasks.dto.ts
+++ b/src/pages/profile_tasks.dto.ts
@@ -6,3 +6,7 @@ export interface ITask {
   description: string;
   tags: string[];
 }
+
+export interface ITaskForm extends Omit<ITask, "date"> {
+  date: string;
+}
diff --git a/src/pages/profile_tasks.tsx b/src/pages/profile_tasks.tsx
index af707f2..e22b9bf 100644
--- a/src/pages/profile_tasks.tsx
+++ b/src/pages/profile_tasks.tsx
@@ -5,6 +5,7 @@ import Button from "@/components/ui/Button";
 import ModalWindow from "@/components/ui/Modal";
 import { withTitle } from "@/constructors/Component";
 import { UrlsTitle } from "@/enums/urls";
+import { cn } from "@/utils/class-merge";
 import { PlusIcon } from "@heroicons/react/20/solid";
 import {
   BookmarkIcon,
@@ -12,13 +13,15 @@ import {
   CalendarDaysIcon,
   DocumentDuplicateIcon,
   FunnelIcon,
+  InboxArrowDownIcon,
   MagnifyingGlassIcon,
   PencilIcon,
 } from "@heroicons/react/24/outline";
 import { FunctionComponent } from "preact";
 import { useEffect, useMemo, useRef, useState } from "preact/hooks";
 import { Nullable } from "primereact/ts-helpers";
-import { ITask } from "./profile_tasks.dto";
+import { SubmitHandler, useForm } from "react-hook-form";
+import { ITask, ITaskForm } from "./profile_tasks.dto";
 import classes from "./profile_tasks.module.scss";
 
 const example_tasks: ITask[] = [
@@ -49,6 +52,15 @@ const example_tasks: ITask[] = [
 ];
 
 const ProfileTasks: FunctionComponent = () => {
+  const [openModal, setIsOpen] = useState(false); // Открыта модалка
+  const [openModalCalendar, setOpenModalCalendar] = useState(false); // Открыта модалка календаря
+  const [isEdit, setIsEdit] = useState(false); // Открыта задача
+  const [isEditModal, setIsEditModal] = useState(false); // Включено редактирование задачи
+  const [isCreating, setIsCreating] = useState(false); // Включено создание задачи
+  const [editContent, setEditContent] = useState<ITask | null>(null); // Содержимое редактируемой задачи
+  const taskNameRef = useRef<HTMLInputElement>(null);
+  const taskDescriptionRef = useRef<HTMLTextAreaElement>(null);
+  const [calendarDate, setCalendarDate] = useState<Nullable<Date>>();
   const getDate = useMemo(() => {
     const date = new Date();
     const formatter = new Intl.DateTimeFormat("ru-RU", { month: "long", day: "numeric" });
@@ -64,23 +76,39 @@ const ProfileTasks: FunctionComponent = () => {
   useEffect(() => {
     localStorage.setItem("tasks", JSON.stringify(tasks));
   }, [tasks]);
-  const [openModal, setIsOpen] = useState(false);
-  const [openModalCalendar, setOpenModalCalendar] = useState(false);
-  const [isEdit, setIsEdit] = useState(false);
-  const [isCreating, setIsCreating] = useState(false);
-  const [editContent, setEditContent] = useState<ITask | null>(null);
-  const taskNameRef = useRef<HTMLInputElement>(null);
-  const taskDescriptionRef = useRef<HTMLTextAreaElement>(null);
-  const [calendarDate, setCalendarDate] = useState<Nullable<Date>>();
+
+  const {
+    handleSubmit,
+    register,
+    reset,
+    formState: { errors },
+  } = useForm<ITaskForm>({
+    defaultValues: {
+      tags: [],
+    },
+  });
+  const saveEdited: SubmitHandler<ITaskForm> = (data) => {
+    if (!editContent) return;
+    const editedTask: ITask = { ...data, date: new Date(data.date) };
+    setTasks(tasks.map((task) => (task.id === editedTask.id ? editedTask : task)));
+    setIsEditModal(false);
+  };
+  useEffect(() => {
+    if (editContent) reset({ ...editContent, date: editContent.date.toISOString().slice(0, 16) });
+    else reset();
+  }, [editContent]);
+  useEffect(() => {
+    if (calendarDate && editContent) setEditContent({ ...editContent, date: calendarDate });
+  }, [calendarDate]);
   return (
     <div class={classes.container}>
       <ModalCalendar
         isOpen={openModalCalendar}
         setIsOpen={setOpenModalCalendar}
         onClose={() => {
-          if (isEdit) setCalendarDate(null);
+          if (isEdit && !isEditModal) setCalendarDate(null);
         }}
-        onChange={(e) => isCreating && setCalendarDate(e.value)}
+        onChange={(e) => (isCreating || isEditModal) && setCalendarDate(e.value)}
         value={calendarDate!}
       />
       <ModalWindow
@@ -90,25 +118,69 @@ const ProfileTasks: FunctionComponent = () => {
           setIsEdit(false);
           setEditContent(null);
           setIsCreating(false);
+          setIsEditModal(false);
           setCalendarDate(null);
         }}
       >
         {isEdit && editContent && (
-          <div class="flex h-full w-full flex-col items-start justify-between">
+          <form class="flex h-full w-full flex-col items-start justify-between" onSubmit={(e) => e.preventDefault()}>
             <div class="flex w-full flex-row items-start justify-between">
-              <div class="flex flex-col">
-                <p class="text-2xl">{editContent.name}</p>
-                <p>{editContent.description}</p>
+              <div class="flex flex-1 flex-col gap-1 pe-2">
+                <input
+                  class="w-full text-2xl outline-0"
+                  disabled={!isEditModal}
+                  placeholder="Название"
+                  {...register("name", {
+                    required: "Заполните название",
+                    maxLength: { value: 20, message: "Максимум 20 символов в названии" },
+                  })}
+                />
+                <textarea
+                  class="h-[5rem] w-full resize-none outline-0"
+                  disabled={!isEditModal}
+                  placeholder={isEditModal ? "Описание" : ""}
+                  {...register("description", {
+                    maxLength: { value: 200, message: "Максимум 200 символов в описании" },
+                  })}
+                />
+                <input
+                  type="datetime-local"
+                  value={calendarDate ? calendarDate.toISOString().slice(0, 16) : ""}
+                  hidden
+                  {...register("date")}
+                />
+                <input type="checkbox" hidden {...register("checked")} />
               </div>
-              <div className="flex cursor-pointer flex-col items-center gap-3">
-                <PencilIcon class="size-6" />
-                <p class="text-[0.7rem]">Редактировать</p>
+              <div
+                className="flex cursor-pointer flex-col items-center gap-3"
+                onClick={() => {
+                  if (isEditModal) handleSubmit(saveEdited)();
+                  else setIsEditModal(!isEditModal);
+                }}
+              >
+                {isEditModal ? (
+                  <>
+                    <InboxArrowDownIcon class="size-6" />
+                    <p class="text-[0.7rem]">Сохранить</p>
+                  </>
+                ) : (
+                  <>
+                    {" "}
+                    <PencilIcon class="size-6" />
+                    <p class="text-[0.7rem]">Редактировать</p>
+                  </>
+                )}
               </div>
             </div>
+            {errors.name && <p class="text-red-500">{errors.name.message}</p>}
+            {errors.description && <p class="text-red-500">{errors.description.message}</p>}
             <div class="flex flex-col items-center gap-6 self-center md:flex-row md:justify-start md:self-start">
               <div
-                class="flex h-full flex-row items-center gap-1 rounded-2xl bg-[rgba(251,194,199,0.38)] px-2 py-1"
+                class={cn("flex h-full flex-row items-center gap-1 rounded-2xl bg-[rgba(251,194,199,0.38)] px-2 py-1", {
+                  "cursor-pointer": isEditModal,
+                })}
                 onClick={() => {
+                  if (!isEditModal) return;
                   setOpenModalCalendar(true);
                   setCalendarDate(editContent.date);
                 }}
@@ -135,7 +207,7 @@ const ProfileTasks: FunctionComponent = () => {
                 </p>
               </div>
             </div>
-          </div>
+          </form>
         )}
         {isCreating && (
           <div class="flex h-full w-full flex-col items-start justify-between">
@@ -214,6 +286,7 @@ const ProfileTasks: FunctionComponent = () => {
                     setIsOpen(true);
                     setIsEdit(true);
                     setEditContent(task);
+                    setCalendarDate(task.date);
                   }}
                 />
               ))}