diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index fbb92ae2c..fbe4a9d95 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -425,6 +425,8 @@ export default function NewChatPage() {
 					const newThread = await createThread(searchSpaceId, "New Chat");
 					currentThreadId = newThread.id;
 					setThreadId(currentThreadId);
+					// Set currentThread so ChatHeader can show share button immediately
+					setCurrentThread(newThread);
 
 					// Track chat creation
 					trackChatCreated(searchSpaceId, currentThreadId);