diff --git a/frontend/app/components/Client/Projects/ProjectForm.tsx b/frontend/app/components/Client/Projects/ProjectForm.tsx
index 2c940728d..03fa26a70 100644
--- a/frontend/app/components/Client/Projects/ProjectForm.tsx
+++ b/frontend/app/components/Client/Projects/ProjectForm.tsx
@@ -15,19 +15,20 @@ function ProjectForm(props: Props) {
   const [form] = Form.useForm();
   const { onClose } = props;
   const { projectsStore } = useStore();
-  const project = projectsStore.instance as Project;
+  // const project = projectsStore.instance as Project;
+  const project = props.project || new Project();
   const loading = projectsStore.loading;
   const canDelete = projectsStore.list.length > 1;
   const pathname = window.location.pathname;
   const mstore = useStore();
 
   useEffect(() => {
-    if (props.project && props.project.id) {
+    if (props.project) {
       projectsStore.initProject(props.project);
     } else {
       projectsStore.initProject({});
     }
-  }, []);
+  }, [props.project]);
 
   const handleEdit = ({ target: { name, value } }: ChangeEvent<HTMLInputElement>) => {
     projectsStore.editInstance({ [name]: value });
@@ -85,14 +86,16 @@ function ProjectForm(props: Props) {
     });
   };
 
+  console.log('ProjectForm', project);
+
   return (
     <Form
       form={form}
       layout="vertical"
       requiredMark={false}
       onFinish={onSubmit}
+      initialValues={{ ...project }}
     >
-
       <Form.Item
         label="Name"
         name="name"
diff --git a/frontend/app/components/Client/Projects/ProjectList.tsx b/frontend/app/components/Client/Projects/ProjectList.tsx
index 75d059107..fdba1d86e 100644
--- a/frontend/app/components/Client/Projects/ProjectList.tsx
+++ b/frontend/app/components/Client/Projects/ProjectList.tsx
@@ -1,15 +1,19 @@
 import React from 'react';
-import { Avatar, Input, Menu, MenuProps, Progress } from 'antd';
+import { Avatar, Button, Input, Menu, MenuProps, Progress, Typography } from 'antd';
 import { useStore } from '@/mstore';
 import Project from '@/mstore/types/project';
 import { observer } from 'mobx-react-lite';
-import { AppWindowMac, Smartphone } from 'lucide-react';
+import { AppWindowMac, EditIcon, Smartphone } from 'lucide-react';
+import { PencilIcon } from '.store/lucide-react-virtual-3cff663764/package';
+import ProjectForm from 'Components/Client/Projects/ProjectForm';
+import { useModal } from 'Components/ModalContext';
 
 type MenuItem = Required<MenuProps>['items'][number];
 
 const ProjectList: React.FC = () => {
   const { projectsStore } = useStore();
   const [search, setSearch] = React.useState('');
+  const { openModal, closeModal } = useModal();
 
   const filteredProjects = projectsStore.list.filter((project: Project) =>
     project.name.toLowerCase().includes(search.toLowerCase())
@@ -22,9 +26,21 @@ const ProjectList: React.FC = () => {
     projectsStore.setConfigProject(pid);
   };
 
+  const projectEditHandler = (e: React.MouseEvent, project: Project) => {
+    e.stopPropagation();
+
+    openModal(<ProjectForm onClose={closeModal} project={project} />, {
+      title: 'Edit Project'
+    });
+
+  };
+
   const menuItems: MenuItem[] = filteredProjects.map((project) => ({
     key: project.id + '',
-    label: project.name,
+    label: <Typography.Text style={{ color: 'inherit' }} ellipsis={true}>{project.name}</Typography.Text>,
+    extra: <Button onClick={(e) => projectEditHandler(e, project)} className="opacity-0 group-hover:!opacity-100"
+                   size="small" type="link" icon={<PencilIcon size={14} />} />,
+    className: 'group',
     icon: (
       <ProjectIconWithProgress
         platform={project.platform}