diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte
index fadc1a70..cacbecf2 100644
--- a/src/app/components/CalendarEventForm.svelte
+++ b/src/app/components/CalendarEventForm.svelte
@@ -24,28 +24,28 @@
   import {pushToast} from "@app/util/toast"
   import {canEnforceNip70} from "@app/core/commands"
 
-  type CalendarValues = {
-    d?: string
+  type Values = {
+    d: string
     title: string
-    content: unknown
+    content: string | object
     location: string
-    start: number | undefined
-    end: number | undefined
+    start?: number
+    end?: number
   }
 
   type Props = {
     url: string
     h?: string
     header: Snippet
-    initialValues?: CalendarValues
+    initialValues?: Values
   }
 
   let {url, h, header, initialValues}: Props = $props()
 
-  const draftKey = new DraftKey<CalendarValues>(`calendar:${url}:${h ?? ""}`)
-  const draft = draftKey.get()
+  const draftKey = new DraftKey<Values>(`calendar:${url}:${h ?? ""}`)
+
   if (!initialValues) {
-    initialValues = draft
+    initialValues = draftKey.get()
   }
 
   const shouldProtect = canEnforceNip70(url)
@@ -83,9 +83,9 @@
     const ed = await editor
     const content = ed.getText({blockSeparator: "\n"}).trim()
     const tags = [
-      ["d", initialValues?.d || randomId()],
+      ["d", d],
       ["title", title],
-      ["location", location || ""],
+      ["location", location],
       ["start", start.toString()],
       ["end", end.toString()],
       ...daysBetween(start, end).map(D => ["D", D.toString()]),
@@ -108,28 +108,22 @@
     history.back()
   }
 
-  let editorContent = $state<unknown>(initialValues?.content ?? "")
-
-  const onChange = (json: unknown) => {
-    editorContent = json
-  }
-
-  const editor = makeEditor({
-    url,
-    submit,
-    uploading,
-    onChange,
-    content: initialValues?.content ?? "",
-  })
-
+  const d = $state(initialValues?.d ?? randomId())
   let title = $state(initialValues?.title ?? "")
   let location = $state(initialValues?.location ?? "")
   let start: number | undefined = $state(initialValues?.start)
   let end: number | undefined = $state(initialValues?.end)
   let endDirty = $state(Boolean(initialValues?.end))
+  let content = $state(initialValues?.content ?? "")
+
+  const onChange = (json: object) => {
+    content = json
+  }
+
+  const editor = makeEditor({url, submit, uploading, onChange, content})
 
   $effect(() => {
-    draftKey.set({d: initialValues?.d, title, location, start, end, content: editorContent})
+    draftKey.set({d, title, location, start, end, content})
   })
 
   $effect(() => {
diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte
index 47a8dd73..b509234d 100644
--- a/src/app/components/Chat.svelte
+++ b/src/app/components/Chat.svelte
@@ -67,7 +67,7 @@
   const {pubkeys, info}: Props = $props()
 
   const chat = deriveChat(pubkeys)
-  const draftKey = new DraftKey<{content?: unknown}>(`dm:${$chat?.id}`)
+  const draftKey = new DraftKey<{content?: string | object}>(`dm:${$chat?.id}`)
   const others = remove($pubkey!, pubkeys)
   const missingRelayLists = $derived(others.filter(pk => !$messagingRelayListsByPubkey.has(pk)))
 
@@ -338,7 +338,7 @@
       {onSubmit}
       {onEscape}
       {onEditPrevious}
-      content={eventToEdit?.content}
+      initialValues={eventToEdit}
       draftKey={eventToEdit ? undefined : draftKey}
       disabled={Boolean(missingRelayLists.length)} />
   {/key}
diff --git a/src/app/components/ChatCompose.svelte b/src/app/components/ChatCompose.svelte
index b941c1a3..e1e26825 100644
--- a/src/app/components/ChatCompose.svelte
+++ b/src/app/components/ChatCompose.svelte
@@ -12,18 +12,31 @@
   import {makeEditor} from "@app/editor"
   import {type DraftKey} from "@app/util/drafts"
 
+  type Values = {
+    content?: string | object
+  }
+
   type Props = {
-    content?: string
     disabled?: boolean
-    draftKey?: DraftKey<{content?: unknown}>
+    draftKey?: DraftKey<Values>
     onEscape?: () => void
     onEditPrevious?: () => void
     onSubmit: (event: EventContent) => void
+    initialValues?: Values
   }
 
-  const {content, disabled = false, draftKey, onEscape, onEditPrevious, onSubmit}: Props = $props()
+  let {
+    initialValues,
+    disabled = false,
+    draftKey,
+    onEscape,
+    onEditPrevious,
+    onSubmit,
+  }: Props = $props()
 
-  const draft = draftKey?.get()
+  if (!initialValues) {
+    initialValues = draftKey?.get()
+  }
 
   const autofocus = !isMobile && !disabled
 
@@ -67,13 +80,14 @@
     ed.chain().clearContent().run()
   }
 
-  const onChange = (json: unknown) => {
-    draftKey?.set({content: json})
+  let content = $state(initialValues?.content ?? "")
+
+  const onChange = (json: object) => {
+    content = json
   }
 
   const editor = makeEditor({
-    content: content ?? (draft?.content as string | object | undefined),
-    autofocus,
+    content,
     submit,
     uploading,
     onChange,
@@ -81,6 +95,10 @@
     encryptFiles: true,
   })
 
+  $effect(() => {
+    draftKey?.set({content})
+  })
+
   onMount(async () => {
     const ed = await editor
     ed.view.dom.addEventListener("keydown", handleKeyDown)
@@ -105,7 +123,7 @@
     {/if}
   </Button>
   <div class={editorClass} aria-disabled={disabled}>
-    <EditorContent {editor} />
+    <EditorContent {autofocus} {editor} />
   </div>
   <Button
     data-tip="{window.navigator.platform.includes('Mac') ? 'cmd' : 'ctrl'}+enter to send"
diff --git a/src/app/components/ClassifiedForm.svelte b/src/app/components/ClassifiedForm.svelte
index 51911895..13d8a226 100644
--- a/src/app/components/ClassifiedForm.svelte
+++ b/src/app/components/ClassifiedForm.svelte
@@ -23,40 +23,30 @@
   import {DraftKey} from "@app/util/drafts"
   import {canEnforceNip70, uploadFile} from "@app/core/commands"
 
+  type Values = {
+    d: string
+    title: string
+    content: string | object
+    price: number
+    currency: string
+    images: (string | File)[]
+    status: string
+    topics: string[]
+  }
+
   type Props = {
     url: string
     h?: string
     header: Snippet
-    initialValues?: {
-      d?: string
-      title?: string
-      content?: string
-      price?: number
-      currency?: string
-      images?: (string | File)[]
-      status?: string
-      topics?: string[]
-    }
+    initialValues?: Values
   }
 
   let {url, h, header, initialValues}: Props = $props()
 
-  type ClassifiedDraft = {
-    editorContent?: unknown
-    d?: string
-    title?: string
-    content?: string
-    price?: number
-    currency?: string
-    images?: (string | File)[]
-    status?: string
-    topics?: string[]
-  }
+  const draftKey = new DraftKey<Values>(`classified:${url}:${h ?? ""}`)
 
-  const draftKey = new DraftKey<ClassifiedDraft>(`classified:${url}:${h ?? ""}`)
-  const draft = draftKey.get()
   if (!initialValues) {
-    initialValues = draft
+    initialValues = draftKey.get()
   }
 
   const shouldProtect = canEnforceNip70(url)
@@ -85,7 +75,7 @@
       }
 
       const tags = [
-        ["d", initialValues?.d || randomId()],
+        ["d", d],
         ["title", title],
         ["summary", content],
         ["price", String(price), currency],
@@ -136,27 +126,24 @@
     }
   }
 
-  const initialContent = initialValues?.content || ""
-  const onChange = (json: unknown) => {
-    draftKey.set({editorContent: json, title, price, currency, topics, status, images})
-  }
-  const editor = makeEditor({
-    url,
-    submit,
-    onChange,
-    content: draft?.editorContent ?? initialContent,
-  })
-
   let loading = $state(false)
+  const d = $state(initialValues?.d ?? randomId())
   let title = $state(initialValues?.title ?? "")
   let status = $state(initialValues?.status ?? "active")
-  let price = $state(Number(initialValues?.price ?? 0))
+  let price = $state(initialValues?.price ?? 0)
   let currency = $state(initialValues?.currency ?? "SAT")
-  let images = $state<(string | File)[]>(initialValues?.images ?? [])
-  let topics = $state(uniq(removeUndefined((initialValues?.topics ?? []).map(normalizeTopic))))
+  let images = $state(initialValues?.images ?? [])
+  let topics = $state(uniq(removeUndefined(initialValues?.topics?.map(normalizeTopic) ?? [])))
+  let content = $state(initialValues?.content ?? "")
+
+  const onChange = (json: object) => {
+    content = json
+  }
+
+  const editor = makeEditor({url, submit, onChange, content})
 
   $effect(() => {
-    draftKey.set({...draftKey.get(), title, price, currency, topics, status, images})
+    draftKey.set({d, title, status, price, currency, images, topics, content})
   })
 </script>
 
diff --git a/src/app/components/EventReply.svelte b/src/app/components/EventReply.svelte
index 8924d12d..c026dd47 100644
--- a/src/app/components/EventReply.svelte
+++ b/src/app/components/EventReply.svelte
@@ -13,14 +13,16 @@
   import {DraftKey} from "@app/util/drafts"
   import {pushToast} from "@app/util/toast"
 
+  type Values = {
+    content?: string | object
+  }
+
   const {url, event, onClose, onSubmit} = $props()
-
-  const draftKey = new DraftKey<{content?: unknown}>(`reply:${event.id}`)
-  const draft = draftKey.get()
-
+  const draftKey = new DraftKey<Values>(`reply:${event.id}`)
+  const initialValues = draftKey.get()
   const shouldProtect = canEnforceNip70(url)
-
   const uploading = writable(false)
+  const autofocus = !isMobile
 
   const selectFiles = () => editor.then(ed => ed.commands.selectFiles())
 
@@ -46,19 +48,19 @@
     onSubmit(publishComment({event, content, tags, relays: [url]}))
   }
 
-  const onChange = (json: unknown) => draftKey.set({content: json})
-
-  const editor = makeEditor({
-    url,
-    submit,
-    uploading,
-    autofocus: !isMobile,
-    content: draft?.content as string | object | undefined,
-    onChange,
-  })
-
   let form: HTMLElement
   let spacer: HTMLElement
+  let content = $state(initialValues?.content ?? "")
+
+  const onChange = (json: object) => {
+    content = json
+  }
+
+  const editor = makeEditor({url, submit, uploading, content, onChange})
+
+  $effect(() => {
+    draftKey.set({content})
+  })
 
   onMount(() => {
     setTimeout(() => {
@@ -86,7 +88,7 @@
   <div class="card2 mx-2 my-2 bg-alt shadow-md">
     <div class="relative">
       <div class="note-editor flex-grow overflow-hidden">
-        <EditorContent {editor} />
+        <EditorContent {autofocus} {editor} />
       </div>
       <Button
         data-tip="Add an image"
diff --git a/src/app/components/GoalCreate.svelte b/src/app/components/GoalCreate.svelte
index 7a5ce978..1af5c716 100644
--- a/src/app/components/GoalCreate.svelte
+++ b/src/app/components/GoalCreate.svelte
@@ -23,27 +23,24 @@
   import {DraftKey} from "@app/util/drafts"
   import {canEnforceNip70} from "@app/core/commands"
 
+  type Values = {
+    title: string
+    content: string | object
+    amount: number
+  }
+
   type Props = {
     url: string
     h?: string
-    initialValues?: {
-      content?: string
-      amount?: number
-    }
+    initialValues?: Values
   }
 
   let {url, h, initialValues}: Props = $props()
 
-  type GoalDraft = {
-    editorContent?: unknown
-    content?: string
-    amount?: number
-  }
+  const draftKey = new DraftKey<Values>(`goal:${url}:${h ?? ""}`)
 
-  const draftKey = new DraftKey<GoalDraft>(`goal:${url}:${h ?? ""}`)
-  const draft = draftKey.get()
   if (!initialValues) {
-    initialValues = draft
+    initialValues = draftKey.get()
   }
 
   const shouldProtect = canEnforceNip70(url)
@@ -57,7 +54,7 @@
   const submit = async () => {
     if ($uploading) return
 
-    if (!content) {
+    if (!title) {
       return pushToast({
         theme: "error",
         message: "Please provide a title for your funding goal.",
@@ -65,9 +62,9 @@
     }
 
     const ed = await editor
-    const summary = ed.getText({blockSeparator: "\n"}).trim()
+    const content = ed.getText({blockSeparator: "\n"}).trim()
 
-    if (!summary.trim()) {
+    if (!content.trim()) {
       return pushToast({
         theme: "error",
         message: "Please provide details about your funding goal.",
@@ -76,7 +73,7 @@
 
     const tags = [
       ...ed.storage.nostr.getEditorTags(),
-      ["summary", summary],
+      ["summary", content],
       ["amount", String(amount)],
       ["relays", url],
     ]
@@ -91,14 +88,20 @@
 
     publishThunk({
       relays: [url],
-      event: makeEvent(ZAP_GOAL, {content, tags}),
+      event: makeEvent(ZAP_GOAL, {content: title, tags}),
     })
 
     draftKey.clear()
     history.back()
   }
 
-  const onChange = (json: unknown) => draftKey.update({editorContent: json})
+  let title = $state(initialValues?.title ?? "")
+  let amount = $state(initialValues?.amount ?? 1000)
+  let content = $state(initialValues?.content ?? "")
+
+  const onChange = (json: object) => {
+    content = json
+  }
 
   const editor = makeEditor({
     url,
@@ -106,14 +109,11 @@
     uploading,
     onChange,
     placeholder: "What's on your mind?",
-    content: draft?.editorContent as string | object | undefined,
+    content,
   })
 
-  let content = $state(initialValues?.content ?? "")
-  let amount = $state(initialValues?.amount ?? 1000)
-
   $effect(() => {
-    draftKey.update({content, amount})
+    draftKey.update({title, content, amount})
   })
 </script>
 
@@ -133,7 +133,7 @@
             <!-- svelte-ignore a11y_autofocus -->
             <input
               autofocus={!isMobile}
-              bind:value={content}
+              bind:value={title}
               class="grow"
               type="text"
               placeholder="What do funds go towards?" />
diff --git a/src/app/components/PollCreate.svelte b/src/app/components/PollCreate.svelte
index f35f2e07..bd2e0849 100644
--- a/src/app/components/PollCreate.svelte
+++ b/src/app/components/PollCreate.svelte
@@ -25,16 +25,16 @@
   import {DraftKey} from "@app/util/drafts"
   import type {PollType} from "@app/util/polls"
 
-  type DraftOption = {
+  type Option = {
     id: string
     value: string
   }
 
-  type PollDraft = {
-    title?: string
-    pollType?: PollType
+  type Values = {
+    title: string
+    pollType: PollType
     endsAt?: number
-    options?: DraftOption[]
+    options: Option[]
   }
 
   type Props = {
@@ -43,9 +43,8 @@
   }
 
   const {url, h}: Props = $props()
-
-  const draftKey = new DraftKey<PollDraft>(`poll:${url}:${h ?? ""}`)
-  const draft = draftKey.get()
+  const draftKey = new DraftKey<Values>(`poll:${url}:${h ?? ""}`)
+  const initialValues = draftKey.get()
 
   const shouldProtect = canEnforceNip70(url)
 
@@ -144,16 +143,16 @@
     history.back()
   }
 
-  let title = $state(draft?.title ?? "")
-  let pollType = $state<PollType>(draft?.pollType ?? "singlechoice")
-  let endsAt = $state<number | undefined>(draft?.endsAt)
-  let options = $state<DraftOption[]>(
-    draft?.options ?? [
+  let draggedOptionId = $state<string | undefined>()
+  let title = $state(initialValues?.title ?? "")
+  let pollType = $state<PollType>(initialValues?.pollType ?? "singlechoice")
+  let endsAt = $state<number | undefined>(initialValues?.endsAt)
+  let options = $state<Option[]>(
+    initialValues?.options ?? [
       {id: randomId(), value: "Yes"},
       {id: randomId(), value: "No"},
     ],
   )
-  let draggedOptionId = $state<string | undefined>()
 
   $effect(() => {
     draftKey.set({title, pollType, endsAt, options})
diff --git a/src/app/components/RoomCompose.svelte b/src/app/components/RoomCompose.svelte
index e5f05f1f..863ddf6f 100644
--- a/src/app/components/RoomCompose.svelte
+++ b/src/app/components/RoomCompose.svelte
@@ -15,21 +15,26 @@
   import {DraftKey} from "@app/util/drafts"
   import {onDestroy, onMount} from "svelte"
 
+  type Values = {
+    content?: string | object
+  }
+
   type Props = {
     url?: string
     h?: string
-    content?: string
     onEscape?: () => void
     onEditPrevious?: () => void
     onSubmit: (event: EventContent) => void
+    initialValues?: Values
   }
 
-  const {url, h, content, onEscape, onEditPrevious, onSubmit}: Props = $props()
+  let {url, h, initialValues, onEscape, onEditPrevious, onSubmit}: Props = $props()
 
-  type ComposeDraft = {content?: unknown}
+  const draftKey = url || h ? new DraftKey<Values>(`room:${url ?? ""}:${h ?? ""}`) : undefined
 
-  const draftKey = url || h ? new DraftKey<ComposeDraft>(`room:${url ?? ""}:${h ?? ""}`) : undefined
-  const draft = draftKey?.get()
+  if (!initialValues) {
+    initialValues = draftKey?.get()
+  }
 
   const autofocus = !isMobile
 
@@ -71,21 +76,25 @@
     ed.chain().clearContent().run()
   }
 
-  const onChange = (json: unknown) => {
-    draftKey?.set({content: json})
+  let popover: Instance | undefined = $state()
+  let content = $state(initialValues?.content ?? "")
+
+  const onChange = (json: object) => {
+    content = json
   }
 
   const editor = makeEditor({
     url,
-    content: content ?? (draft?.content as string | object | undefined),
-    autofocus,
+    content,
     submit,
     uploading,
     onChange,
     aggressive: true,
   })
 
-  let popover: Instance | undefined = $state()
+  $effect(() => {
+    draftKey?.set({content})
+  })
 
   onMount(async () => {
     const ed = await editor
@@ -124,7 +133,7 @@
     </Tippy>
   </div>
   <div class="chat-editor flex-grow overflow-hidden">
-    <EditorContent {editor} />
+    <EditorContent {autofocus} {editor} />
   </div>
   <Button
     data-tip="{window.navigator.platform.includes('Mac') ? 'cmd' : 'ctrl'}+enter to send"
diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte
index 97e74fa7..45b69f0d 100644
--- a/src/app/components/ThreadCreate.svelte
+++ b/src/app/components/ThreadCreate.svelte
@@ -21,16 +21,19 @@
   import {DraftKey} from "@app/util/drafts"
   import {canEnforceNip70} from "@app/core/commands"
 
+  type Values = {
+    content?: string | object
+    title?: string
+  }
+
   type Props = {
     url: string
     h?: string
   }
 
   const {url, h}: Props = $props()
-
-  const draftKey = new DraftKey<{content?: unknown; title?: string}>(`thread:${url}:${h ?? ""}`)
-  const draft = draftKey.get()
-
+  const draftKey = new DraftKey<Values>(`thread:${url}:${h ?? ""}`)
+  const initialValues = draftKey.get()
   const shouldProtect = canEnforceNip70(url)
 
   const uploading = writable(false)
@@ -78,7 +81,12 @@
     history.back()
   }
 
-  const onChange = (json: unknown) => draftKey.update({content: json})
+  let title = $state(initialValues?.title ?? "")
+  let content = $state(initialValues?.content ?? "")
+
+  const onChange = (json: object) => {
+    content = json
+  }
 
   const editor = makeEditor({
     url,
@@ -86,13 +94,11 @@
     uploading,
     onChange,
     placeholder: "What's on your mind?",
-    content: draft?.content as string | object | undefined,
+    content,
   })
 
-  let title: string = $state(draft?.title ?? "")
-
   $effect(() => {
-    draftKey.update({title})
+    draftKey.update({title, content})
   })
 </script>
 
diff --git a/src/app/editor/EditorContent.svelte b/src/app/editor/EditorContent.svelte
index cdf764fe..a9c9b009 100644
--- a/src/app/editor/EditorContent.svelte
+++ b/src/app/editor/EditorContent.svelte
@@ -4,9 +4,10 @@
 
   type Props = {
     editor: Promise<Editor>
+    autofocus?: boolean
   }
 
-  const {editor}: Props = $props()
+  const {editor, autofocus}: Props = $props()
 
   let element: HTMLElement
 
@@ -16,7 +17,7 @@
         element?.append(ed.options.element)
       }
 
-      if ((ed as any)._shouldAutofocus) {
+      if (autofocus) {
         const hasContent = ed.getText().trim().length > 0
 
         requestAnimationFrame(() => {
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index ba9b0589..f56fd4b1 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -25,7 +25,6 @@ import {pushToast} from "@app/util/toast"
 export const makeEditor = async ({
   encryptFiles = false,
   aggressive = false,
-  autofocus = false,
   charCount,
   content = "",
   onChange,
@@ -37,10 +36,9 @@ export const makeEditor = async ({
 }: {
   encryptFiles?: boolean
   aggressive?: boolean
-  autofocus?: boolean
   charCount?: Writable<number>
   content?: string | object
-  onChange?: (json: unknown) => void
+  onChange?: (json: object) => void
   placeholder?: string
   url?: string
   submit: () => void
@@ -86,7 +84,6 @@ export const makeEditor = async ({
 
   const ed = new Editor({
     content: typeof content === "string" ? escapeHtml(content) : content,
-    autofocus: false,
     editorProps,
     element: document.createElement("div"),
     extensions: [
@@ -148,7 +145,5 @@ export const makeEditor = async ({
     },
   })
 
-  ;(ed as any)._shouldAutofocus = autofocus
-
   return ed
 }
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index fca7bd03..a35c471e 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -464,7 +464,7 @@
           {onSubmit}
           {onEscape}
           {onEditPrevious}
-          content={eventToEdit?.content}
+          initialValues={eventToEdit}
           bind:this={compose} />
       {/key}
     {/if}
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 8972fe44..7e557ebb 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -352,7 +352,7 @@
       {onSubmit}
       {onEscape}
       {onEditPrevious}
-      content={eventToEdit?.content}
+      initialValues={eventToEdit}
       bind:this={compose} />
   {/key}
 </div>