diff --git a/site/src/pages/AgentsPage/AgentChatPageView.tsx b/site/src/pages/AgentsPage/AgentChatPageView.tsx
index 24b6a8fdd0..8625d6a443 100644
--- a/site/src/pages/AgentsPage/AgentChatPageView.tsx
+++ b/site/src/pages/AgentsPage/AgentChatPageView.tsx
@@ -404,6 +404,7 @@ export const AgentChatPageView: FC<AgentChatPageViewProps> = ({
 											label: "Terminal",
 											content: (
 												<TerminalPanel
+													chatId={agentId}
 													isVisible={
 														shouldShowSidebar && sidebarTabId === "terminal"
 													}
diff --git a/site/src/pages/AgentsPage/components/TerminalPanel.stories.tsx b/site/src/pages/AgentsPage/components/TerminalPanel.stories.tsx
index 7a0cc4775e..c18d3ff01a 100644
--- a/site/src/pages/AgentsPage/components/TerminalPanel.stories.tsx
+++ b/site/src/pages/AgentsPage/components/TerminalPanel.stories.tsx
@@ -31,6 +31,7 @@ const meta = {
 	title: "pages/AgentsPage/TerminalPanel",
 	component: TerminalPanel,
 	args: {
+		chatId: "b5a8832c-72db-4679-8393-9a48dff20a20",
 		workspaceAgent: createAgent("ready"),
 	},
 	parameters: {
diff --git a/site/src/pages/AgentsPage/components/TerminalPanel.tsx b/site/src/pages/AgentsPage/components/TerminalPanel.tsx
index 65db88ec16..9d0cb8fe51 100644
--- a/site/src/pages/AgentsPage/components/TerminalPanel.tsx
+++ b/site/src/pages/AgentsPage/components/TerminalPanel.tsx
@@ -16,12 +16,16 @@ import { WorkspaceTerminalAlerts } from "#/modules/terminal/WorkspaceTerminalAle
 import { openMaybePortForwardedURL } from "#/utils/portForward";
 
 interface TerminalPanelProps {
+	/** Used as the reconnection token so the PTY session survives
+	 * navigation and page reloads. */
+	chatId: string;
 	isVisible?: boolean;
 	workspace?: TypesGen.Workspace;
 	workspaceAgent?: TypesGen.WorkspaceAgent;
 }
 
 export const TerminalPanel: FC<TerminalPanelProps> = ({
+	chatId,
 	isVisible,
 	workspace,
 	workspaceAgent,
@@ -29,7 +33,6 @@ export const TerminalPanel: FC<TerminalPanelProps> = ({
 	const { proxy } = useProxy();
 	const { metadata } = useEmbeddedMetadata();
 	const terminalRef = useRef<WorkspaceTerminalHandle>(null);
-	const [reconnectionToken] = useState(() => crypto.randomUUID());
 	const [connectionStatus, setConnectionStatus] =
 		useState<ConnectionStatus>("initializing");
 	const config = useQuery(deploymentConfig());
@@ -95,7 +98,7 @@ export const TerminalPanel: FC<TerminalPanelProps> = ({
 					isVisible={isVisible}
 					onStatusChange={setConnectionStatus}
 					onError={handleTerminalError}
-					reconnectionToken={reconnectionToken}
+					reconnectionToken={chatId}
 					baseUrl={terminalConfig.baseUrl}
 					terminalFontFamily={terminalConfig.fontFamily}
 					renderer={terminalConfig.renderer}