diff --git a/src/notes/components/NotesPanel.tsx b/src/notes/components/NotesPanel.tsx
index 35245a3e..f23b9621 100644
--- a/src/notes/components/NotesPanel.tsx
+++ b/src/notes/components/NotesPanel.tsx
@@ -51,8 +51,10 @@ export const NotesPanel = ({ projectId }: { projectId: number }) => {
         <NoteEditor
           projectId={projectId}
           className="shadow"
-          onCreated={async () => {
+          onCreated={async (id) => {
+            // First create → switch to edit mode so the editor stays open
             setCreating(false)
+            setEditingId(id)
             await refetch()
           }}
           onSaved={async () => {