diff --git a/app/(app)/event/[naddr]/_components/Header.tsx b/app/(app)/event/[naddr]/_components/Header.tsx
index c6afdb2..2a17847 100644
--- a/app/(app)/event/[naddr]/_components/Header.tsx
+++ b/app/(app)/event/[naddr]/_components/Header.tsx
@@ -27,7 +27,7 @@ import { formatDate } from "@/lib/utils/dates";
 import SmallCalendarIcon from "@/components/EventIcons/DateIcon";
 import LocationIcon from "@/components/EventIcons/LocationIcon";
 
-const EditListModal = dynamic(() => import("@/components/Modals/EditList"), {
+const EditEventModal = dynamic(() => import("@/components/Modals/EditEvent"), {
   ssr: false,
 });
 const CreateListEvent = dynamic(
@@ -164,7 +164,7 @@ export default function Header({ event }: { event: NDKEvent }) {
                 <Button
                   variant="ghost"
                   onClick={() =>
-                    modal?.show(<EditListModal listEvent={rawEvent} />)
+                    modal?.show(<EditEventModal listEvent={rawEvent} />)
                   }
                 >
                   Edit
diff --git a/components/Modals/EditEvent.tsx b/components/Modals/EditEvent.tsx
new file mode 100644
index 0000000..6f66ad6
--- /dev/null
+++ b/components/Modals/EditEvent.tsx
@@ -0,0 +1,96 @@
+import { useEffect, useState } from "react";
+import FormModal from "./FormModal";
+import { z } from "zod";
+import useEvents from "@/lib/hooks/useEvents";
+import { updateList } from "@/lib/actions/create";
+import { unixTimeNowInSeconds } from "@/lib/nostr/dates";
+import { useModal } from "@/app/_providers/modal/provider";
+import { toast } from "sonner";
+import { useNDK } from "@/app/_providers/ndk";
+import { NostrEvent } from "@nostr-dev-kit/ndk";
+import { getTagValues } from "@/lib/nostr/utils";
+
+const EditListSchema = z.object({
+  name: z.string(),
+  description: z.string().optional(),
+  image: z.string().optional(),
+});
+
+type EditListType = z.infer<typeof EditListSchema>;
+
+type EditListModalProps = {
+  listEvent: NostrEvent;
+};
+export default function EditListModal({ listEvent }: EditListModalProps) {
+  const modal = useModal();
+  const [isLoading, setIsLoading] = useState(false);
+  const [sent, setSent] = useState(false);
+  const { ndk } = useNDK();
+  const { events } = useEvents({
+    filter: {
+      kinds: [listEvent.kind as number],
+      authors: [listEvent.pubkey],
+      since: unixTimeNowInSeconds() - 10,
+      limit: 1,
+    },
+    enabled: sent,
+  });
+  useEffect(() => {
+    if (events.length) {
+      console.log("Done!");
+      setIsLoading(false);
+      toast.success("List Updated!");
+      modal?.hide();
+    }
+  }, [events]);
+
+  async function handleSubmit(listData: EditListType) {
+    setIsLoading(true);
+    const newTags = Object.entries(listData);
+    setSent(true);
+    const result = await updateList(
+      ndk!,
+      { ...listEvent, content: listData.description ?? "" },
+      newTags,
+    );
+  }
+  const defaultValues: Partial<EditListType> = {
+    name:
+      getTagValues("title", listEvent.tags) ??
+      getTagValues("name", listEvent.tags),
+    image:
+      getTagValues("image", listEvent.tags) ??
+      getTagValues("picture", listEvent.tags),
+    description: listEvent.content,
+  };
+
+  return (
+    <FormModal
+      title="Edit List"
+      fields={[
+        {
+          label: "Name",
+          type: "input",
+          slug: "name",
+        },
+        {
+          label: "Image",
+          type: "input",
+          slug: "image",
+        },
+        {
+          label: "Description",
+          type: "text-area",
+          slug: "description",
+        },
+      ]}
+      defaultValues={defaultValues ?? {}}
+      formSchema={EditListSchema}
+      onSubmit={handleSubmit}
+      isSubmitting={isLoading}
+      cta={{
+        text: "Save Changes",
+      }}
+    />
+  );
+}