diff --git a/src/components/journal/CreateSessionDialog.tsx b/src/components/journal/CreateSessionDialog.tsx
index 0ce847a..2b82498 100644
--- a/src/components/journal/CreateSessionDialog.tsx
+++ b/src/components/journal/CreateSessionDialog.tsx
@@ -1,11 +1,10 @@
 /**
  * CreateSessionDialog — modal for naming a new session
  */
-import { Component, createSignal, Show } from "solid-js";
+import { Component, createSignal, onMount } from "solid-js";
 import { createSession } from "../stores/journalStream";
 
 interface CreateSessionDialogProps {
-  open: boolean;
   onClose: () => void;
 }
 
@@ -23,56 +22,56 @@ export const CreateSessionDialog: Component<CreateSessionDialogProps> = (
     props.onClose();
   };
 
+  onMount(() => inputRef?.focus());
+
   return (
-    <Show when={props.open}>
+    <div
+      class="absolute inset-0 z-50 flex items-center justify-center bg-black/20"
+      onClick={props.onClose}
+    >
       <div
-        class="absolute inset-0 z-50 flex items-center justify-center bg-black/20"
-        onClick={props.onClose}
+        class="bg-white rounded-lg border border-gray-200 shadow-xl w-[280px] p-4 space-y-3"
+        onClick={(e) => e.stopPropagation()}
       >
-        <div
-          class="bg-white rounded-lg border border-gray-200 shadow-xl w-[280px] p-4 space-y-3"
-          onClick={(e) => e.stopPropagation()}
-        >
-          <div class="flex items-center justify-between">
-            <h3 class="text-sm font-semibold text-gray-800">新建会话</h3>
-            <button
-              onClick={props.onClose}
-              class="text-gray-400 hover:text-gray-600 text-sm"
-            >
-              ✕
-            </button>
-          </div>
-          <p class="text-xs text-gray-500">输入新会话的名称。</p>
-          <input
-            ref={inputRef!}
-            type="text"
-            value={name()}
-            onInput={(e) => setName(e.currentTarget.value)}
-            onKeyDown={(e) => {
-              if (e.key === "Enter") handleCreate();
-              if (e.key === "Escape") props.onClose();
-            }}
-            placeholder="会话名称"
-            class="w-full border border-gray-300 rounded px-2 py-1.5 text-sm"
-            autofocus
-          />
-          <div class="flex justify-end gap-1">
-            <button
-              onClick={props.onClose}
-              class="px-3 py-1 text-xs text-gray-600 hover:text-gray-800"
-            >
-              取消
-            </button>
-            <button
-              onClick={handleCreate}
-              disabled={!name().trim()}
-              class="bg-blue-600 text-white rounded px-3 py-1 text-xs font-medium hover:bg-blue-700 disabled:opacity-50"
-            >
-              创建
-            </button>
-          </div>
+        <div class="flex items-center justify-between">
+          <h3 class="text-sm font-semibold text-gray-800">新建会话</h3>
+          <button
+            onClick={props.onClose}
+            class="text-gray-400 hover:text-gray-600 text-sm"
+          >
+            ✕
+          </button>
+        </div>
+        <p class="text-xs text-gray-500">输入新会话的名称。</p>
+        <input
+          ref={inputRef!}
+          type="text"
+          value={name()}
+          onInput={(e) => setName(e.currentTarget.value)}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") handleCreate();
+            if (e.key === "Escape") props.onClose();
+          }}
+          placeholder="会话名称"
+          class="w-full border border-gray-300 rounded px-2 py-1.5 text-sm"
+          autofocus
+        />
+        <div class="flex justify-end gap-1">
+          <button
+            onClick={props.onClose}
+            class="px-3 py-1 text-xs text-gray-600 hover:text-gray-800"
+          >
+            取消
+          </button>
+          <button
+            onClick={handleCreate}
+            disabled={!name().trim()}
+            class="bg-blue-600 text-white rounded px-3 py-1 text-xs font-medium hover:bg-blue-700 disabled:opacity-50"
+          >
+            创建
+          </button>
         </div>
       </div>
-    </Show>
+    </div>
   );
 };
diff --git a/src/components/journal/JournalHeader.tsx b/src/components/journal/JournalHeader.tsx
index 0628e06..ae37cac 100644
--- a/src/components/journal/JournalHeader.tsx
+++ b/src/components/journal/JournalHeader.tsx
@@ -7,6 +7,7 @@ import { SessionDropdown } from "./SessionDropdown";
 
 interface JournalHeaderProps {
   onClose: () => void;
+  onCreateSession: () => void;
 }
 
 export const JournalHeader: Component<JournalHeaderProps> = (props) => {
@@ -51,7 +52,7 @@ export const JournalHeader: Component<JournalHeaderProps> = (props) => {
             </p>
             {/* Clickable subtitle — session dropdown (GM only) */}
             <Show when={stream.myRole === "gm"}>
-              <SessionDropdown />
+              <SessionDropdown onCreate={props.onCreateSession} />
             </Show>
           </div>
         </Show>
diff --git a/src/components/journal/JournalPanel.tsx b/src/components/journal/JournalPanel.tsx
index 0f3df92..c2752d9 100644
--- a/src/components/journal/JournalPanel.tsx
+++ b/src/components/journal/JournalPanel.tsx
@@ -13,6 +13,7 @@ import { JournalContext } from "./JournalContext";
 import { JournalHeader } from "./JournalHeader";
 import { ConnectDialog } from "./ConnectDialog";
 import { InviteDialog } from "./InviteDialog";
+import { CreateSessionDialog } from "./CreateSessionDialog";
 
 export interface JournalPanelProps {
   open: boolean;
@@ -22,6 +23,7 @@ export interface JournalPanelProps {
 export const JournalPanel: Component<JournalPanelProps> = (props) => {
   const stream = useJournalStream();
   const [showInvite, setShowInvite] = createSignal(false);
+  const [showCreateSession, setShowCreateSession] = createSignal(false);
 
   // Player list (exclude gm and observer)
   const playerEntries = () =>
@@ -48,7 +50,10 @@ export const JournalPanel: Component<JournalPanelProps> = (props) => {
       >
         <JournalContext.Provider value={{ onClose: props.onClose }}>
           {/* Header */}
-          <JournalHeader onClose={props.onClose} />
+          <JournalHeader
+            onClose={props.onClose}
+            onCreateSession={() => setShowCreateSession(true)}
+          />
 
           {/* Player list tabs */}
           <Show when={stream.connected}>
@@ -88,6 +93,11 @@ export const JournalPanel: Component<JournalPanelProps> = (props) => {
           <Show when={showInvite()}>
             <InviteDialog onClose={() => setShowInvite(false)} />
           </Show>
+
+          {/* Create session modal */}
+          <Show when={showCreateSession()}>
+            <CreateSessionDialog onClose={() => setShowCreateSession(false)} />
+          </Show>
         </JournalContext.Provider>
       </aside>
     </>
diff --git a/src/components/journal/SessionDropdown.tsx b/src/components/journal/SessionDropdown.tsx
index dd39790..06ed6bf 100644
--- a/src/components/journal/SessionDropdown.tsx
+++ b/src/components/journal/SessionDropdown.tsx
@@ -8,13 +8,15 @@ import {
   hydrateFromServer,
   useJournalStream,
 } from "../stores/journalStream";
-import { CreateSessionDialog } from "./CreateSessionDialog";
 
-export const SessionDropdown: Component = () => {
+interface SessionDropdownProps {
+  onCreate: () => void;
+}
+
+export const SessionDropdown: Component<SessionDropdownProps> = (props) => {
   const stream = useJournalStream();
   const manifest = sessions;
   const [dropdownOpen, setDropdownOpen] = createSignal(false);
-  const [showCreateDialog, setShowCreateDialog] = createSignal(false);
   let dropdownRef!: HTMLDivElement;
 
   const handleSessionSelect = (id: string) => {
@@ -75,7 +77,8 @@ export const SessionDropdown: Component = () => {
             onClick={(e) => {
               e.stopPropagation();
               e.preventDefault();
-              setShowCreateDialog(true);
+              setDropdownOpen(false);
+              props.onCreate();
             }}
             class="w-full text-left px-3 py-1 text-xs text-blue-600 hover:bg-gray-100"
           >
@@ -83,10 +86,6 @@ export const SessionDropdown: Component = () => {
           </button>
         </div>
       </Show>
-      <CreateSessionDialog
-        open={showCreateDialog()}
-        onClose={() => setShowCreateDialog(false)}
-      />
     </div>
   );
 };