diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx
index 4cb7fde926f..20b75b264d9 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx
@@ -214,12 +214,12 @@ export function DashboardSidebarHeader({
 			    horizontal inset — keeps traffic-light alignment matching the
 			    TopBar's 80px pad regardless of parent padding changes. */}
 			<div
-				className="drag -mx-2 flex h-8 items-center gap-1.5"
+				className="drag -mx-2 flex h-8 items-center gap-1.5 pr-2"
 				style={{ paddingLeft: isMac ? "80px" : "8px" }}
 			>
 				<SidebarToggle />
-				<NavigationControls showHistoryDropdown={false} />
-				<ResourceConsumption surface="v2" />
+				<NavigationControls />
+				<ResourceConsumption surface="v2" className="ml-auto" />
 			</div>
 			<OrganizationDropdown variant="expanded" />
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/NavigationControls.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/NavigationControls.tsx
index ad6b1bff0ed..43e44d79886 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/NavigationControls.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/NavigationControls.tsx
@@ -5,13 +5,7 @@ import { LuArrowLeft, LuArrowRight } from "react-icons/lu";
 import { HotkeyLabel, useHotkey } from "renderer/hotkeys";
 import { HistoryDropdown } from "./components/HistoryDropdown";
 
-interface NavigationControlsProps {
-	showHistoryDropdown?: boolean;
-}
-
-export function NavigationControls({
-	showHistoryDropdown = true,
-}: NavigationControlsProps = {}) {
+export function NavigationControls() {
 	const router = useRouter();
 	const location = useLocation();
 
@@ -70,7 +64,7 @@ export function NavigationControls({
 				</TooltipContent>
 			</Tooltip>
 
-			{showHistoryDropdown && <HistoryDropdown />}
+			<HistoryDropdown />
 		</div>
 	);
 }
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/HistoryDropdown.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/HistoryDropdown.tsx
index 7bf1c177ae9..78e3f52ec04 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/HistoryDropdown.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/HistoryDropdown.tsx
@@ -11,7 +11,9 @@ import { cn } from "@superset/ui/utils";
 import { eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useLocation, useNavigate } from "@tanstack/react-router";
-import { LuHistory } from "react-icons/lu";
+import { LuCpu, LuGitBranch, LuHistory } from "react-icons/lu";
+import { usePresetIcon } from "renderer/assets/app-icons/preset-icons";
+import { useIsV2CloudEnabled } from "renderer/hooks/useIsV2CloudEnabled";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import {
 	StatusIcon,
@@ -75,6 +77,94 @@ function WorkspaceRow({
 	);
 }
 
+function V2WorkspaceRow({
+	entry,
+	isCurrent,
+	v2WorkspaceData,
+	onSelect,
+}: {
+	entry: RecentlyViewedEntry;
+	isCurrent: boolean;
+	v2WorkspaceData: {
+		id: string;
+		projectName: string;
+		branch: string;
+	}[];
+	onSelect: () => void;
+}) {
+	const ws = v2WorkspaceData.find((w) => w.id === entry.entityId);
+
+	return (
+		<DropdownMenuItem
+			className={cn("gap-2.5", isCurrent && "bg-accent/50")}
+			onSelect={onSelect}
+		>
+			<span className="text-muted-foreground text-xs shrink-0 w-20 text-left line-clamp-1">
+				{ws ? ws.projectName : "Workspace"}
+			</span>
+			<span className="flex items-center justify-center w-4 shrink-0">
+				<LuGitBranch
+					className="size-3 text-muted-foreground"
+					strokeWidth={1.5}
+				/>
+			</span>
+			<span
+				className={cn(
+					"truncate text-xs font-normal flex-1 min-w-0",
+					!ws && "text-muted-foreground",
+				)}
+			>
+				{ws ? ws.branch : "Unknown"}
+			</span>
+		</DropdownMenuItem>
+	);
+}
+
+function AutomationRow({
+	entry,
+	isCurrent,
+	automationData,
+	onSelect,
+}: {
+	entry: RecentlyViewedEntry;
+	isCurrent: boolean;
+	automationData: {
+		id: string;
+		name: string;
+		agentId: string;
+	}[];
+	onSelect: () => void;
+}) {
+	const automation = automationData.find((a) => a.id === entry.entityId);
+	const presetIcon = usePresetIcon(automation?.agentId ?? "");
+
+	return (
+		<DropdownMenuItem
+			className={cn("gap-2.5", isCurrent && "bg-accent/50")}
+			onSelect={onSelect}
+		>
+			<span className="text-muted-foreground text-xs shrink-0 w-20 text-left line-clamp-1">
+				Automation
+			</span>
+			<span className="flex items-center justify-center w-4 shrink-0">
+				{presetIcon ? (
+					<img src={presetIcon} alt="" className="size-3.5 object-contain" />
+				) : (
+					<LuCpu className="size-3 text-muted-foreground" strokeWidth={1.5} />
+				)}
+			</span>
+			<span
+				className={cn(
+					"truncate text-xs font-normal flex-1 min-w-0",
+					!automation && "text-muted-foreground",
+				)}
+			>
+				{automation ? automation.name : "Unknown"}
+			</span>
+		</DropdownMenuItem>
+	);
+}
+
 function TaskRow({
 	entry,
 	isCurrent,
@@ -138,6 +228,7 @@ export function HistoryDropdown() {
 	const recentEntries = useRecentlyViewed(20);
 	const currentPath = useLocation({ select: (loc) => loc.pathname });
 	const collections = useCollections();
+	const isV2CloudEnabled = useIsV2CloudEnabled();
 
 	const { data: groups } = electronTrpc.workspaces.getAllGrouped.useQuery();
 	const workspaceData = (groups ?? []).flatMap((group) =>
@@ -149,6 +240,34 @@ export function HistoryDropdown() {
 		})),
 	);
 
+	const { data: v2WorkspaceData } = useLiveQuery(
+		(q) =>
+			q
+				.from({ workspaces: collections.v2Workspaces })
+				.innerJoin(
+					{ projects: collections.v2Projects },
+					({ workspaces, projects }) => eq(workspaces.projectId, projects.id),
+				)
+				.select(({ workspaces, projects }) => ({
+					id: workspaces.id,
+					projectName: projects.name,
+					branch: workspaces.branch,
+				})),
+		[collections],
+	);
+
+	const { data: automationData } = useLiveQuery(
+		(q) =>
+			q
+				.from({ automations: collections.automations })
+				.select(({ automations }) => ({
+					id: automations.id,
+					name: automations.name,
+					agentId: automations.agentConfig.id,
+				})),
+		[collections],
+	);
+
 	const { data: taskData } = useLiveQuery(
 		(q) =>
 			q
@@ -169,8 +288,17 @@ export function HistoryDropdown() {
 
 	const filteredEntries = recentEntries.filter((entry) => {
 		if (entry.type === "workspace") {
+			if (isV2CloudEnabled) return false;
 			return workspaceData.some((w) => w.id === entry.entityId);
 		}
+		if (entry.type === "v2-workspace") {
+			if (!isV2CloudEnabled) return false;
+			return (v2WorkspaceData ?? []).some((w) => w.id === entry.entityId);
+		}
+		if (entry.type === "automation") {
+			if (!isV2CloudEnabled) return false;
+			return (automationData ?? []).some((a) => a.id === entry.entityId);
+		}
 		return (taskData ?? []).some(
 			(t) => t.id === entry.entityId || t.slug === entry.entityId,
 		);
@@ -211,16 +339,41 @@ export function HistoryDropdown() {
 			<DropdownMenuContent align="start" className="w-80">
 				<DropdownMenuLabel>Recently Viewed</DropdownMenuLabel>
 				<DropdownMenuSeparator />
-				{filteredEntries.map((entry) =>
-					entry.type === "task" ? (
-						<TaskRow
-							key={entry.path}
-							entry={entry}
-							isCurrent={entry.path === currentPath}
-							taskData={taskData ?? []}
-							onSelect={() => navigate({ to: entry.path })}
-						/>
-					) : (
+				{filteredEntries.map((entry) => {
+					if (entry.type === "task") {
+						return (
+							<TaskRow
+								key={entry.path}
+								entry={entry}
+								isCurrent={entry.path === currentPath}
+								taskData={taskData ?? []}
+								onSelect={() => navigate({ to: entry.path })}
+							/>
+						);
+					}
+					if (entry.type === "v2-workspace") {
+						return (
+							<V2WorkspaceRow
+								key={entry.path}
+								entry={entry}
+								isCurrent={entry.path === currentPath}
+								v2WorkspaceData={v2WorkspaceData ?? []}
+								onSelect={() => navigate({ to: entry.path })}
+							/>
+						);
+					}
+					if (entry.type === "automation") {
+						return (
+							<AutomationRow
+								key={entry.path}
+								entry={entry}
+								isCurrent={entry.path === currentPath}
+								automationData={automationData ?? []}
+								onSelect={() => navigate({ to: entry.path })}
+							/>
+						);
+					}
+					return (
 						<WorkspaceRow
 							key={entry.path}
 							entry={entry}
@@ -228,8 +381,8 @@ export function HistoryDropdown() {
 							workspaceData={workspaceData}
 							onSelect={() => navigate({ to: entry.path })}
 						/>
-					),
-				)}
+					);
+				})}
 			</DropdownMenuContent>
 		</DropdownMenu>
 	);
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/hooks/useRecentlyViewed/useRecentlyViewed.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/hooks/useRecentlyViewed/useRecentlyViewed.ts
index 562d09656d5..6d7e7b278e7 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/hooks/useRecentlyViewed/useRecentlyViewed.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NavigationControls/components/HistoryDropdown/hooks/useRecentlyViewed/useRecentlyViewed.ts
@@ -4,31 +4,56 @@ import { persistentHistory } from "renderer/lib/persistent-hash-history";
 
 export interface RecentlyViewedEntry {
 	path: string;
-	type: "workspace" | "task";
+	type: "workspace" | "v2-workspace" | "task" | "automation";
 	entityId: string;
 	timestamp: number;
 }
 
+function pathnameOf(href: string): string {
+	const queryIndex = href.indexOf("?");
+	const hashIndex = href.indexOf("#");
+	const cutoffs = [queryIndex, hashIndex].filter((i) => i >= 0);
+	return cutoffs.length === 0 ? href : href.substring(0, Math.min(...cutoffs));
+}
+
 function parseResourceEntry(entry: {
 	path: string;
 	timestamp: number;
 }): RecentlyViewedEntry | null {
-	const wsMatch = entry.path.match(/^\/workspace\/(.+)$/);
+	const pathname = pathnameOf(entry.path);
+
+	const v2WsMatch = pathname.match(/^\/v2-workspace\/([^/]+)/);
+	if (v2WsMatch?.[1])
+		return {
+			path: `/v2-workspace/${v2WsMatch[1]}`,
+			type: "v2-workspace",
+			entityId: v2WsMatch[1],
+			timestamp: entry.timestamp,
+		};
+	const wsMatch = pathname.match(/^\/workspace\/([^/]+)/);
 	if (wsMatch?.[1])
 		return {
-			path: entry.path,
+			path: `/workspace/${wsMatch[1]}`,
 			type: "workspace",
 			entityId: wsMatch[1],
 			timestamp: entry.timestamp,
 		};
-	const taskMatch = entry.path.match(/^\/tasks\/(.+)$/);
+	const taskMatch = pathname.match(/^\/tasks\/([^/]+)/);
 	if (taskMatch?.[1])
 		return {
-			path: entry.path,
+			path: `/tasks/${taskMatch[1]}`,
 			type: "task",
 			entityId: taskMatch[1],
 			timestamp: entry.timestamp,
 		};
+	const automationMatch = pathname.match(/^\/automations\/([^/]+)/);
+	if (automationMatch?.[1])
+		return {
+			path: `/automations/${automationMatch[1]}`,
+			type: "automation",
+			entityId: automationMatch[1],
+			timestamp: entry.timestamp,
+		};
 	return null;
 }
 
@@ -41,10 +66,10 @@ export function useRecentlyViewed(limit = 20): RecentlyViewedEntry[] {
 
 	for (let i = allEntries.length - 1; i >= 0; i--) {
 		const entry = allEntries[i];
-		if (!entry || seen.has(entry.path)) continue;
+		if (!entry) continue;
 		const resource = parseResourceEntry(entry);
-		if (resource) {
-			seen.set(entry.path, resource);
+		if (resource && !seen.has(resource.path)) {
+			seen.set(resource.path, resource);
 		}
 	}
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/TopBar.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/TopBar.tsx
index 85e87916d6d..f5bf4cfe613 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/TopBar.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/TopBar.tsx
@@ -54,8 +54,7 @@ export function TopBar() {
 				{!sidebarHostsChrome && (
 					<>
 						<SidebarToggle />
-						<NavigationControls showHistoryDropdown={false} />
-						<ResourceConsumption surface={isV2CloudEnabled ? "v2" : "v1"} />
+						<NavigationControls />
 					</>
 				)}
 			</div>
@@ -85,6 +84,9 @@ export function TopBar() {
 			)}
 
 			<div className="flex items-center gap-3 h-full pr-4 shrink-0">
+				{!sidebarHostsChrome && (
+					<ResourceConsumption surface={isV2CloudEnabled ? "v2" : "v1"} />
+				)}
 				{!isOnline && (
 					<div className="no-drag flex items-center gap-1.5 text-xs text-muted-foreground bg-muted px-2 py-1 rounded">
 						<HiOutlineWifi className="size-3.5" />
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/ResourceConsumption.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/ResourceConsumption.tsx
index cfb35c95c0b..b8a2d61d1f9 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/ResourceConsumption.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/ResourceConsumption.tsx
@@ -1,4 +1,5 @@
 import type { WorkspaceState } from "@superset/panes";
+import { Button } from "@superset/ui/button";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -90,10 +91,12 @@ function getTerminalTitleOverrides(
 
 interface ResourceConsumptionProps {
 	surface?: "v1" | "v2";
+	className?: string;
 }
 
 export function ResourceConsumption({
 	surface = "v1",
+	className,
 }: ResourceConsumptionProps) {
 	const [open, setOpen] = useState(false);
 	const [sortOption, setSortOption] = useState<SortOption>("memory");
@@ -344,40 +347,32 @@ export function ResourceConsumption({
 			<Tooltip delayDuration={150}>
 				<TooltipTrigger asChild>
 					<PopoverTrigger asChild>
-						<button
-							type="button"
-							className="no-drag inline-flex items-center gap-1.5 h-6 px-2 rounded-md text-muted-foreground hover:text-foreground hover:bg-foreground/[0.06] transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+						<Button
+							variant="ghost"
+							size="icon-xs"
 							aria-label="Resource consumption"
+							className={cn(
+								"no-drag relative text-muted-foreground hover:text-foreground",
+								className,
+							)}
 						>
-							<span className="relative flex items-center">
-								<HiOutlineCpuChip className="h-3.5 w-3.5 shrink-0" />
-								{triggerDotColorClass && (
-									<span
-										className={cn(
-											"absolute -top-0.5 -right-0.5 h-1.5 w-1.5 rounded-full ring-2 ring-background",
-											triggerDotColorClass,
-										)}
-									/>
-								)}
-							</span>
-							{normalizedSnapshot && (
-								<span className="text-xs font-medium tabular-nums tracking-tight hidden md:inline">
-									{formatMemory(normalizedSnapshot.totalMemory)}
-								</span>
+							<HiOutlineCpuChip className="size-3.5" />
+							{triggerDotColorClass && (
+								<span
+									className={cn(
+										"absolute top-0.5 right-0.5 size-1.5 rounded-full ring-2 ring-background",
+										triggerDotColorClass,
+									)}
+								/>
 							)}
-						</button>
+						</Button>
 					</PopoverTrigger>
 				</TooltipTrigger>
-				{normalizedSnapshot && (
-					<TooltipContent
-						side="bottom"
-						sideOffset={6}
-						showArrow={false}
-						className="md:hidden"
-					>
-						{formatMemory(normalizedSnapshot.totalMemory)}
-					</TooltipContent>
-				)}
+				<TooltipContent side="bottom" sideOffset={6} showArrow={false}>
+					{normalizedSnapshot
+						? `Resources · ${formatMemory(normalizedSnapshot.totalMemory)}`
+						: "Resources"}
+				</TooltipContent>
 			</Tooltip>
 
 			<PopoverContent align="start" className="w-[28rem] p-0 overflow-hidden">