diff --git a/client/src/Post.scss b/client/src/Post.scss
index 4c17338..8d7c7a6 100644
--- a/client/src/Post.scss
+++ b/client/src/Post.scss
@@ -6,6 +6,17 @@
   padding: 7px;
   resize: none;
   margin: 1rem 0;
+  transition: height 0.5s;
+
+  &.postEditing {
+    padding: 0;
+    &:focus-within {
+      border-color: mediumpurple;
+      outline: solid mediumpurple 2px;
+    }
+    height: 6rem;
+    transition: height 0.5s;
+  }
 
   .text {
     word-wrap: anywhere;
@@ -39,8 +50,18 @@
     }
 
     .actions {
+      display: flex;
       align-self: end;
 
+      > * {
+        margin-left: 0.5rem;
+      }
+
+      > *:first-child {
+        margin-left: 0;
+      }
+
+
       button {
         background: none;
         border: none;
diff --git a/client/src/Post.tsx b/client/src/Post.tsx
index 6a01eef..6fd555e 100644
--- a/client/src/Post.tsx
+++ b/client/src/Post.tsx
@@ -1,5 +1,8 @@
 import "./Post.scss";
-import { Form, Link } from "react-router-dom";
+import { Form, Link, useSubmit } from "react-router-dom";
+import { useState } from "react";
+
+import "./PostForm.scss";
 
 export function Post({
     text,
@@ -14,6 +17,35 @@ export function Post({
     actions: boolean;
     id: number;
 }) {
+    const [editing, setEditing] = useState(false);
+    const submit = useSubmit();
+
+    if (editing) {
+        return (
+            <div className={"post postEditing"}>
+                <Form className={"postForm"} method="patch">
+                    <input hidden={true} name={"postId"} value={id} />
+                    <textarea
+                        placeholder={"Write something!"}
+                        name="text"
+                        defaultValue={text}
+                    />
+                    <button
+                        name="intent"
+                        value="updatePost"
+                        type="submit"
+                        onClick={(e) => {
+                            setEditing(false);
+                            submit(e.currentTarget);
+                        }}
+                    >
+                        save
+                    </button>
+                </Form>
+            </div>
+        );
+    }
+
     return (
         <div className={"post"}>
             <span className={"text"}>{text}</span>
@@ -29,6 +61,7 @@ export function Post({
                 </div>
                 {actions && (
                     <div className={"actions"}>
+                        {<button onClick={() => setEditing(true)}>edit</button>}
                         <Form method={"delete"}>
                             <input
                                 hidden={true}
diff --git a/client/src/PostForm.scss b/client/src/PostForm.scss
new file mode 100644
index 0000000..d938af5
--- /dev/null
+++ b/client/src/PostForm.scss
@@ -0,0 +1,24 @@
+.postForm {
+  min-height: 100%;
+  display: flex;
+  flex-direction: row;
+  flex: auto;
+
+  textarea {
+    flex-grow: 1;
+    border: 0px;
+    border-radius: 7px 0 0 7px;
+    padding: 7px;
+    resize: none;
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  button {
+    border: 0px;
+    border-radius: 0 7px 7px 0;
+  }
+
+}
diff --git a/client/src/Profile.scss b/client/src/Profile.scss
index c716e33..e7e34ac 100644
--- a/client/src/Profile.scss
+++ b/client/src/Profile.scss
@@ -37,30 +37,6 @@
       outline: solid mediumpurple 2px;
     }
 
-    form {
-      min-height: 100%;
-      display: flex;
-      flex-direction: row;
-      flex: auto;
-
-      textarea {
-        flex-grow: 1;
-        border: 0px;
-        border-radius: 7px 0 0 7px;
-        padding: 7px;
-        resize: none;
-
-        &:focus {
-          outline: none;
-        }
-      }
-
-      button {
-        border: 0px;
-        border-radius: 0 7px 7px 0;
-      }
-
-    }
   }
 
   .posts {
diff --git a/client/src/Profile.tsx b/client/src/Profile.tsx
index 25a56b4..321faa3 100644
--- a/client/src/Profile.tsx
+++ b/client/src/Profile.tsx
@@ -1,4 +1,3 @@
-import "./Profile.scss";
 import { Form, Link, useLoaderData } from "react-router-dom";
 import { LoaderToType, profileLoader } from "./loaders";
 import { isError } from "./api/dto";
@@ -6,6 +5,9 @@ import { Post } from "./Post";
 import { useHomeContext } from "./HomeContext";
 import { PostList } from "./PostList";
 
+import "./PostForm.scss";
+import "./Profile.scss";
+
 export interface IProfileProps {
     self: boolean;
 }
@@ -35,7 +37,7 @@ export function Profile({ self }: IProfileProps) {
             </div>
             {self && (
                 <div className={"newPost"}>
-                    <Form method="post">
+                    <Form className={"postForm"} method="post">
                         <textarea
                             placeholder={"Write something!"}
                             name="text"
diff --git a/client/src/actions.ts b/client/src/actions.ts
index 867e1cf..bbebb0f 100644
--- a/client/src/actions.ts
+++ b/client/src/actions.ts
@@ -3,7 +3,7 @@ import { ActionFunctionArgs, redirect } from "react-router-dom";
 import { login } from "./api/Token";
 import { isError } from "./api/dto";
 import { deleteToken, setToken } from "./api/utils";
-import { createPost, deletePost } from "./api/Post";
+import { createPost, deletePost, updatePost } from "./api/Post";
 
 export type ActionToType<T extends (...args: any) => any> =
     | Exclude<Awaited<ReturnType<T>>, Response>
@@ -59,6 +59,11 @@ export async function profileSelfAction({ request }: ActionFunctionArgs) {
         return await deletePost(
             parseInt(formData.get("postToDeleteId")!.toString()),
         );
+    } else if (intent == "updatePost") {
+        return await updatePost(
+            formData.get("text")!.toString(),
+            parseInt(formData.get("postId")!.toString()),
+        );
     }
 }
 
diff --git a/client/src/api/Post.ts b/client/src/api/Post.ts
index 7c530d3..f817166 100644
--- a/client/src/api/Post.ts
+++ b/client/src/api/Post.ts
@@ -14,6 +14,14 @@ export async function createPost(text: string): Promise<TPostToResp> {
     });
 }
 
+export async function updatePost(
+    text: string,
+    postId: number,
+): Promise<TPostToResp> {
+    return fetchJSONAuth("/post/" + postId, "PATCH", PostToResp, {
+        text,
+    });
+}
 export async function deletePost(id: number): Promise<TNoContentToResp> {
     return fetchJSONAuth(`/post/${id.toString()}`, "DELETE", NoContentToResp);
 }
diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/controller/PostController.java b/server/src/main/java/com/usatiuk/tjv/y/server/controller/PostController.java
index a394e92..8837be1 100644
--- a/server/src/main/java/com/usatiuk/tjv/y/server/controller/PostController.java
+++ b/server/src/main/java/com/usatiuk/tjv/y/server/controller/PostController.java
@@ -64,6 +64,15 @@ public class PostController {
         return PostMapper.makeDto(post.get());
     }
 
+    @PatchMapping(path = "/{id}")
+    public PostTo update(Principal principal, @PathVariable long id, @RequestBody PostCreateTo postCreateTo) {
+        var post = postService.readById(id).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
+        if (!Objects.equals(post.getAuthor().getUuid(), principal.getName()))
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN);
+        post.setText(postCreateTo.text());
+        postService.update(post);
+        return PostMapper.makeDto(post);
+    }
 
     @DeleteMapping(path = "/{id}")
     @ResponseStatus(HttpStatus.NO_CONTENT)
diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudService.java b/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudService.java
index 5aba0b8..208e6c4 100644
--- a/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudService.java
+++ b/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudService.java
@@ -12,7 +12,7 @@ public interface CrudService<T extends EntityWithId<ID>, ID extends Serializable
 
     Iterable<T> readAll();
 
-    void update(ID id, T e);
+    void update(T e);
 
     void deleteById(ID id);
 }
diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudServiceImpl.java b/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudServiceImpl.java
index 4e5c861..623d35b 100644
--- a/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudServiceImpl.java
+++ b/server/src/main/java/com/usatiuk/tjv/y/server/service/CrudServiceImpl.java
@@ -27,8 +27,8 @@ public abstract class CrudServiceImpl<T extends EntityWithId<ID>, ID extends Ser
     }
 
     @Override
-    public void update(ID id, T e) {
-
+    public void update(T e) {
+        getRepository().save(e);
     }
 
     @Override