diff --git a/apps/yaak-client/components/CurlViewer.tsx b/apps/yaak-client/components/CurlViewer.tsx
new file mode 100644
index 000000000..9c6e9d615
--- /dev/null
+++ b/apps/yaak-client/components/CurlViewer.tsx
@@ -0,0 +1,54 @@
+import { useQuery } from "@tanstack/react-query";
+import type { HttpRequest } from "@yaakapp-internal/models";
+import type { CSSProperties } from "react";
+import { requestToCurl } from "../lib/curl";
+import { CopyIconButton } from "./CopyIconButton";
+import { Editor } from "./core/Editor/LazyEditor";
+
+interface Props {
+  request: HttpRequest;
+  style?: CSSProperties;
+}
+
+export function CurlViewer({ request, style }: Props) {
+  const curl = useQuery({
+    queryKey: ["request_curl", request.id, request.updatedAt],
+    queryFn: () => requestToCurl(request, "send"),
+  });
+
+  const value = curl.data ?? "";
+
+  return (
+    <div
+      style={style}
+      className="x-theme-responsePane relative h-full max-h-full min-w-0 overflow-hidden rounded-md border border-border-subtle bg-surface"
+    >
+      {curl.isError ? (
+        <div className="p-3 text-sm text-danger">Failed to render curl command.</div>
+      ) : (
+        <>
+          <div className="absolute inset-0">
+            <Editor
+              readOnly
+              forceUpdateKey={value}
+              stateKey={`curl.${request.id}`}
+              defaultValue={curl.isPending ? "Rendering curl..." : value}
+              language="shell"
+              heightMode="full"
+              wrapLines
+            />
+          </div>
+          <div className="pointer-events-none absolute right-2 top-2 z-20">
+            <CopyIconButton
+              text={value}
+              size="xs"
+              title="Copy Curl command"
+              disabled={!value}
+              className="pointer-events-auto bg-surface/80 opacity-75 shadow-sm backdrop-blur-sm hover:!opacity-100 focus-visible:!opacity-100"
+            />
+          </div>
+        </>
+      )}
+    </div>
+  );
+}
diff --git a/apps/yaak-client/components/HttpRequestLayout.tsx b/apps/yaak-client/components/HttpRequestLayout.tsx
index 2ee1233d7..1a41b3bdc 100644
--- a/apps/yaak-client/components/HttpRequestLayout.tsx
+++ b/apps/yaak-client/components/HttpRequestLayout.tsx
@@ -3,10 +3,12 @@ import type { SlotProps } from "@yaakapp-internal/ui";
 import { SplitLayout } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { useAtomValue } from "jotai";
-import type { CSSProperties } from "react";
+import type { CSSProperties, ReactNode } from "react";
 import { useCurrentGraphQLSchema } from "../hooks/useIntrospectGraphQL";
 import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
 import { workspaceLayoutAtom } from "../lib/atoms";
+import { curlPanelRequestIdAtom } from "../lib/curlPanel";
+import { CurlViewer } from "./CurlViewer";
 import { GraphQLDocsExplorer } from "./graphql/GraphQLDocsExplorer";
 import { showGraphQLDocExplorerAtom } from "./graphql/graphqlAtoms";
 import { HttpRequestPane } from "./HttpRequestPane";
@@ -22,7 +24,9 @@ export function HttpRequestLayout({ activeRequest, style }: Props) {
   const graphQLSchema = useCurrentGraphQLSchema(activeRequest);
   const workspaceLayout = useAtomValue(workspaceLayoutAtom);
   const activeWorkspace = useAtomValue(activeWorkspaceAtom);
+  const curlPanelRequestId = useAtomValue(curlPanelRequestIdAtom);
   const wsId = activeWorkspace?.id ?? "n/a";
+  const showCurlPanelForRequest = curlPanelRequestId === activeRequest.id;
 
   const requestResponseSplit = ({ style }: Pick<SlotProps, "style">) => (
     <SplitLayout
@@ -49,21 +53,72 @@ export function HttpRequestLayout({ activeRequest, style }: Props) {
     graphQLSchema != null
   ) {
     return (
-      <SplitLayout
-        storageKey={`graphql_layout::${wsId}`}
-        defaultRatio={1 / 3}
-        firstSlot={requestResponseSplit}
-        secondSlot={({ style, orientation }) => (
-          <GraphQLDocsExplorer
-            requestId={activeRequest.id}
-            schema={graphQLSchema}
-            className={classNames(orientation === "horizontal" && "!ml-0")}
+      <CurlSplit
+        activeRequest={activeRequest}
+        style={style}
+        showCurlPanel={showCurlPanelForRequest}
+        workspaceId={wsId}
+        mainSlot={({ style }) => (
+          <SplitLayout
+            storageKey={`graphql_layout::${wsId}`}
+            defaultRatio={1 / 3}
             style={style}
+            firstSlot={requestResponseSplit}
+            secondSlot={({ style, orientation }) => (
+              <GraphQLDocsExplorer
+                requestId={activeRequest.id}
+                schema={graphQLSchema}
+                className={classNames(orientation === "horizontal" && "!ml-0")}
+                style={style}
+              />
+            )}
           />
         )}
       />
     );
   }
 
-  return requestResponseSplit({ style });
+  return (
+    <CurlSplit
+      activeRequest={activeRequest}
+      style={style}
+      showCurlPanel={showCurlPanelForRequest}
+      workspaceId={wsId}
+      mainSlot={requestResponseSplit}
+    />
+  );
+}
+
+function CurlSplit({
+  activeRequest,
+  mainSlot,
+  showCurlPanel,
+  style,
+  workspaceId,
+}: {
+  activeRequest: HttpRequest;
+  mainSlot: (props: Pick<SlotProps, "style">) => ReactNode;
+  showCurlPanel: boolean;
+  style: CSSProperties;
+  workspaceId: string;
+}) {
+  if (!showCurlPanel) {
+    return mainSlot({ style });
+  }
+
+  return (
+    <SplitLayout
+      storageKey={`curl_layout::${workspaceId}`}
+      style={style}
+      defaultRatio={0.28}
+      minWidthPx={280}
+      layout="horizontal"
+      firstSlot={mainSlot}
+      secondSlot={({ style }) => (
+        <div style={style} className="p-3 pl-0">
+          <CurlViewer request={activeRequest} />
+        </div>
+      )}
+    />
+  );
 }
diff --git a/apps/yaak-client/components/RecentRequestsDropdown.tsx b/apps/yaak-client/components/RecentRequestsDropdown.tsx
index 12b150ef8..8efd114ac 100644
--- a/apps/yaak-client/components/RecentRequestsDropdown.tsx
+++ b/apps/yaak-client/components/RecentRequestsDropdown.tsx
@@ -1,5 +1,6 @@
 import classNames from "classnames";
-import { useMemo, useRef } from "react";
+import type { MouseEvent } from "react";
+import { useCallback, useMemo, useRef } from "react";
 import { useActiveRequest } from "../hooks/useActiveRequest";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { allRequestsAtom } from "../hooks/useAllRequests";
@@ -7,6 +8,7 @@ import { useHotKey } from "../hooks/useHotKey";
 import { useKeyboardEvent } from "../hooks/useKeyboardEvent";
 import { useRecentRequests } from "../hooks/useRecentRequests";
 import { jotaiStore } from "../lib/jotai";
+import { renameModelWithPrompt } from "../lib/renameModelWithPrompt";
 import { resolvedModelName } from "../lib/resolvedModelName";
 import { router } from "../lib/router";
 import { Button } from "./core/Button";
@@ -46,6 +48,18 @@ export function RecentRequestsDropdown({ className }: Props) {
     dropdownRef.current?.prev?.();
   });
 
+  const handleDoubleClick = useCallback(
+    (e: MouseEvent<HTMLButtonElement>) => {
+      e.preventDefault();
+      e.stopPropagation();
+      if (activeRequest == null) return;
+
+      dropdownRef.current?.close?.();
+      void renameModelWithPrompt(activeRequest);
+    },
+    [activeRequest],
+  );
+
   const items = useMemo(() => {
     const activeWorkspaceId = jotaiStore.get(activeWorkspaceIdAtom);
     if (activeWorkspaceId === null) return [];
@@ -88,6 +102,7 @@ export function RecentRequestsDropdown({ className }: Props) {
       <Button
         size="sm"
         hotkeyAction="switcher.toggle"
+        onDoubleClick={handleDoubleClick}
         className={classNames(
           className,
           "truncate pointer-events-auto",
diff --git a/apps/yaak-client/components/RedirectToLatestWorkspace.tsx b/apps/yaak-client/components/RedirectToLatestWorkspace.tsx
index 49616ac5c..dfcf84d2d 100644
--- a/apps/yaak-client/components/RedirectToLatestWorkspace.tsx
+++ b/apps/yaak-client/components/RedirectToLatestWorkspace.tsx
@@ -7,6 +7,7 @@ import { getRecentRequests } from "../hooks/useRecentRequests";
 import { useRecentWorkspaces } from "../hooks/useRecentWorkspaces";
 import { fireAndForget } from "../lib/fireAndForget";
 import { router } from "../lib/router";
+import { setWorkspaceSearchParams } from "../lib/setWorkspaceSearchParams";
 
 export function RedirectToLatestWorkspace() {
   const workspaces = useAtomValue(workspacesAtom);
@@ -31,11 +32,11 @@ export function RedirectToLatestWorkspace() {
         const search = {
           cookie_jar_id: cookieJarId,
           environment_id: environmentId,
-          request_id: requestId,
         };
 
         console.log("Redirecting to workspace", params, search);
         await router.navigate({ to: "/workspaces/$workspaceId", params, search });
+        setWorkspaceSearchParams({ request_id: requestId, folder_id: null });
       })(),
     );
   }, [recentWorkspaces, workspaces, workspaces.length]);
diff --git a/apps/yaak-client/components/RequestTabs.tsx b/apps/yaak-client/components/RequestTabs.tsx
new file mode 100644
index 000000000..006fe24c0
--- /dev/null
+++ b/apps/yaak-client/components/RequestTabs.tsx
@@ -0,0 +1,372 @@
+import type { DragEndEvent, DragMoveEvent, DragStartEvent } from "@dnd-kit/core";
+import {
+  closestCenter,
+  DndContext,
+  DragOverlay,
+  PointerSensor,
+  useDraggable,
+  useDroppable,
+  useSensor,
+  useSensors,
+} from "@dnd-kit/core";
+import type { GrpcRequest, HttpRequest, WebsocketRequest } from "@yaakapp-internal/models";
+import { patchModel } from "@yaakapp-internal/models";
+import { computeSideForDragMove, DropMarker, Icon } from "@yaakapp-internal/ui";
+import classNames from "classnames";
+import { useAtomValue } from "jotai";
+import type { MouseEvent } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { activeRequestIdAtom } from "../hooks/useActiveRequestId";
+import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
+import { allRequestsAtom } from "../hooks/useAllRequests";
+import { useRequestTabsState } from "../hooks/useRequestTabs";
+import {
+  activateRequestTab,
+  closeAllRequestTabs,
+  closeOtherRequestTabs,
+  closeRequestTab,
+  closeRequestTabsToRight,
+  pinRequestTab,
+  reorderRequestTabs,
+} from "../lib/requestTabs";
+import { copyRequestAsCurl } from "../lib/curl";
+import { showCurlPanel } from "../lib/curlPanel";
+import { duplicateRequestOrFolderAndNavigate } from "../lib/duplicateRequestOrFolderAndNavigate";
+import { resolvedModelName } from "../lib/resolvedModelName";
+import { CreateDropdown } from "./CreateDropdown";
+import { ContextMenu } from "./core/Dropdown";
+import type { DropdownItem } from "./core/Dropdown";
+import { HttpMethodTag } from "./core/HttpMethodTag";
+import { IconButton } from "./core/IconButton";
+
+type RequestModel = HttpRequest | GrpcRequest | WebsocketRequest;
+
+interface TabModel {
+  request: RequestModel;
+  isActive: boolean;
+  isPreview: boolean;
+}
+
+export function RequestTabs() {
+  const workspaceId = useAtomValue(activeWorkspaceIdAtom);
+  const activeRequestId = useAtomValue(activeRequestIdAtom);
+  const allRequests = useAtomValue(allRequestsAtom);
+  const { tabs: tabIds } = useRequestTabsState();
+
+  const requestById = useMemo(() => {
+    const map = new Map<string, RequestModel>();
+    for (const r of allRequests) map.set(r.id, r);
+    return map;
+  }, [allRequests]);
+
+  const tabs = useMemo<TabModel[]>(() => {
+    const result: TabModel[] = [];
+    for (const id of tabIds) {
+      const request = requestById.get(id);
+      if (request == null) continue;
+      result.push({
+        request,
+        isActive: id === activeRequestId,
+        isPreview: false,
+      });
+    }
+    return result;
+  }, [tabIds, requestById, activeRequestId]);
+
+  // Local order for smooth drag-and-drop, synced from persisted state
+  const [orderedTabs, setOrderedTabs] = useState<TabModel[]>(tabs);
+  const [dragging, setDragging] = useState<TabModel | null>(null);
+  const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
+  useEffect(() => setOrderedTabs(tabs), [tabs]);
+
+  const [menu, setMenu] = useState<{ x: number; y: number; id: string } | null>(null);
+
+  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 6 } }));
+
+  const onDragStart = useCallback(
+    (e: DragStartEvent) => {
+      setDragging(orderedTabs.find((t) => t.request.id === e.active.id) ?? null);
+    },
+    [orderedTabs],
+  );
+
+  const onDragMove = useCallback(
+    (e: DragMoveEvent) => {
+      const overId = e.over?.id as string | undefined;
+      if (!overId) return setHoveredIndex(null);
+      const side = computeSideForDragMove(overId, e, "horizontal");
+      if (side === null) return setHoveredIndex(null);
+      const overIndex = orderedTabs.findIndex((t) => t.request.id === overId);
+      if (overIndex === -1) return setHoveredIndex(null);
+      setHoveredIndex(overIndex + (side === "before" ? 0 : 1));
+    },
+    [orderedTabs],
+  );
+
+  const resetDrag = useCallback(() => {
+    setDragging(null);
+    setHoveredIndex(null);
+  }, []);
+
+  const onDragEnd = useCallback(
+    (e: DragEndEvent) => {
+      resetDrag();
+      if (workspaceId == null) return;
+      const activeId = e.active.id as string | undefined;
+      const overId = e.over?.id as string | undefined;
+      if (!activeId || !overId || activeId === overId) return;
+
+      const from = orderedTabs.findIndex((t) => t.request.id === activeId);
+      const baseTo = orderedTabs.findIndex((t) => t.request.id === overId);
+      const to = hoveredIndex ?? baseTo;
+      if (from === -1 || to === -1 || from === to) return;
+
+      const next = [...orderedTabs];
+      const [moved] = next.splice(from, 1);
+      if (moved === undefined) return;
+      next.splice(to > from ? to - 1 : to, 0, moved);
+      setOrderedTabs(next);
+      void reorderRequestTabs(
+        workspaceId,
+        next.map((t) => t.request.id),
+      );
+    },
+    [resetDrag, workspaceId, orderedTabs, hoveredIndex],
+  );
+
+  const contextMenuItems = useMemo<DropdownItem[]>(() => {
+    if (menu == null || workspaceId == null) return [];
+    const id = menu.id;
+    const idx = tabIds.indexOf(id);
+    const request = requestById.get(id);
+    const isHttpRequest = request?.model === "http_request";
+    const hasTabsToRight = idx >= 0 && idx < tabIds.length - 1;
+    return [
+      {
+        label: "Copy as Curl",
+        leftSlot: <Icon icon="copy" />,
+        hidden: !isHttpRequest,
+        onSelect: async () => {
+          if (request?.model !== "http_request") return;
+          await copyRequestAsCurl(request);
+        },
+      },
+      {
+        label: "View Curl",
+        leftSlot: <Icon icon="square_terminal" />,
+        hidden: !isHttpRequest,
+        onSelect: () => {
+          if (request?.model !== "http_request") return;
+          activateRequestTab(request.id);
+          showCurlPanel(request.id);
+        },
+      },
+      {
+        type: "separator",
+        hidden: !isHttpRequest,
+      },
+      {
+        label: "Duplicate",
+        hotKeyAction: "model.duplicate",
+        hotKeyLabelOnly: true,
+        leftSlot: <Icon icon="copy" />,
+        hidden: request == null,
+        onSelect: () => duplicateRequestOrFolderAndNavigate(request ?? null),
+      },
+      {
+        label: "Save Request",
+        leftSlot: <Icon icon="save" />,
+        hidden: request?.model !== "http_request" || request.isSaved === true,
+        onSelect: () => {
+          if (request?.model === "http_request") {
+            patchModel(request, { isSaved: true });
+          }
+        },
+      },
+      {
+        type: "separator",
+        hidden: request == null,
+      },
+      {
+        label: "Close",
+        leftSlot: <Icon icon="x" />,
+        onSelect: () => closeRequestTab(workspaceId, id),
+      },
+      {
+        label: "Close Others",
+        leftSlot: <Icon icon="x" />,
+        hidden: tabIds.length <= 1,
+        onSelect: () => closeOtherRequestTabs(workspaceId, id),
+      },
+      {
+        label: "Close to the Right",
+        leftSlot: <Icon icon="x" />,
+        hidden: !hasTabsToRight,
+        onSelect: () => closeRequestTabsToRight(workspaceId, id),
+      },
+      {
+        label: "Close All",
+        leftSlot: <Icon icon="x" />,
+        onSelect: () => closeAllRequestTabs(workspaceId),
+      },
+    ];
+  }, [menu, workspaceId, tabIds, requestById]);
+
+  if (tabIds.length === 0) {
+    return null;
+  }
+
+  return (
+    <div className="flex flex-shrink-0 items-stretch bg-surface border-b border-border-subtle h-9 min-h-9">
+      <div className="flex items-stretch overflow-x-auto hide-scrollbars">
+        <DndContext
+          autoScroll
+          sensors={sensors}
+          collisionDetection={closestCenter}
+          onDragStart={onDragStart}
+          onDragMove={onDragMove}
+          onDragEnd={onDragEnd}
+          onDragCancel={resetDrag}
+        >
+          {orderedTabs.map((tab, i) => (
+            <div key={tab.request.id} className="flex items-stretch">
+              {hoveredIndex === i && <DropMarker orientation="vertical" />}
+              <RequestTab
+                tab={tab}
+                workspaceId={workspaceId}
+                isDragging={dragging?.request.id === tab.request.id}
+                onContextMenu={(x, y) => setMenu({ x, y, id: tab.request.id })}
+              />
+            </div>
+          ))}
+          {hoveredIndex === orderedTabs.length && <DropMarker orientation="vertical" />}
+          <DragOverlay dropAnimation={null}>
+            {dragging && <RequestTab tab={dragging} workspaceId={workspaceId} overlay />}
+          </DragOverlay>
+        </DndContext>
+      </div>
+      <CreateDropdown hideFolder>
+        <IconButton
+          size="sm"
+          icon="plus"
+          title="New Request"
+          className="flex-shrink-0 ml-0.5 my-auto text-text-subtle hover:text-text"
+        />
+      </CreateDropdown>
+      {menu != null && (
+        <ContextMenu
+          triggerPosition={{ x: menu.x, y: menu.y }}
+          items={contextMenuItems}
+          onClose={() => setMenu(null)}
+        />
+      )}
+    </div>
+  );
+}
+
+interface RequestTabProps {
+  tab: TabModel;
+  workspaceId: string | null;
+  isDragging?: boolean;
+  overlay?: boolean;
+  onContextMenu?: (x: number, y: number) => void;
+}
+
+function RequestTab({ tab, workspaceId, isDragging, overlay, onContextMenu }: RequestTabProps) {
+  const { request, isActive, isPreview } = tab;
+  const {
+    attributes,
+    listeners,
+    setNodeRef: setDraggableRef,
+  } = useDraggable({
+    id: request.id,
+    disabled: overlay,
+    attributes: { tabIndex: -1 },
+  });
+  const { setNodeRef: setDroppableRef } = useDroppable({ id: request.id, disabled: overlay });
+
+  const setRef = useCallback(
+    (n: HTMLDivElement | null) => {
+      if (overlay) return;
+      setDraggableRef(n);
+      setDroppableRef(n);
+    },
+    [overlay, setDraggableRef, setDroppableRef],
+  );
+
+  const handleClick = useCallback(() => {
+    if (!isActive) activateRequestTab(request.id);
+  }, [isActive, request.id]);
+
+  const handleDoubleClick = useCallback(() => {
+    if (workspaceId != null && isPreview) void pinRequestTab(workspaceId, request.id);
+  }, [workspaceId, isPreview, request.id]);
+
+  const handleAuxClick = useCallback(
+    (e: MouseEvent) => {
+      // Middle-click closes the tab
+      if (e.button === 1 && workspaceId != null) {
+        e.preventDefault();
+        void closeRequestTab(workspaceId, request.id);
+      }
+    },
+    [workspaceId, request.id],
+  );
+
+  const handleContextMenu = useCallback(
+    (e: MouseEvent) => {
+      e.preventDefault();
+      onContextMenu?.(e.clientX, e.clientY);
+    },
+    [onContextMenu],
+  );
+
+  const handleClose = useCallback(
+    (e: MouseEvent) => {
+      e.stopPropagation();
+      if (workspaceId != null) void closeRequestTab(workspaceId, request.id);
+    },
+    [workspaceId, request.id],
+  );
+
+  return (
+    <div
+      ref={setRef}
+      role="tab"
+      aria-selected={isActive}
+      onClick={handleClick}
+      onDoubleClick={handleDoubleClick}
+      onAuxClick={handleAuxClick}
+      onContextMenu={handleContextMenu}
+      className={classNames(
+        "group relative flex items-center gap-1.5 pl-3 pr-1.5 select-none cursor-default",
+        "border-r border-border-subtle min-w-[8rem] max-w-[14rem]",
+        isActive
+          ? "bg-surface-active text-text"
+          : "text-text-subtle hover:text-text hover:bg-surface-highlight",
+        isDragging && "opacity-50",
+        overlay && "opacity-90 border bg-surface-active rounded",
+      )}
+      {...(overlay ? {} : { ...attributes, ...listeners })}
+    >
+      {isActive && (
+        <span className="absolute left-0 right-0 bottom-0 h-[2px] bg-text-subtle" aria-hidden />
+      )}
+      <HttpMethodTag short request={request} className="text-xs flex-shrink-0" />
+      <div className={classNames("truncate text-sm", isPreview && "italic")}>
+        {resolvedModelName(request)}
+      </div>
+      <IconButton
+        size="xs"
+        icon="x"
+        title="Close tab"
+        tabIndex={-1}
+        onClick={handleClose}
+        className={classNames(
+          "flex-shrink-0 ml-auto !w-5 !h-5 opacity-0 group-hover:opacity-70 hover:!opacity-100",
+          isActive && "opacity-70",
+        )}
+      />
+    </div>
+  );
+}
diff --git a/apps/yaak-client/components/Sidebar.tsx b/apps/yaak-client/components/Sidebar.tsx
index 985dc078a..4cc23cda8 100644
--- a/apps/yaak-client/components/Sidebar.tsx
+++ b/apps/yaak-client/components/Sidebar.tsx
@@ -8,6 +8,7 @@ import type {
   Folder,
   GrpcRequest,
   HttpRequest,
+  HttpResponse,
   ModelPayload,
   WebsocketRequest,
   Workspace,
@@ -45,18 +46,19 @@ import { useHotKey } from "../hooks/useHotKey";
 import { getHttpRequestActions } from "../hooks/useHttpRequestActions";
 import { useListenToTauriEvent } from "../hooks/useListenToTauriEvent";
 import { getModelAncestors } from "../hooks/useModelAncestors";
+import { useDeleteSendHistory } from "../hooks/useDeleteSendHistory";
 import { sendAnyHttpRequest } from "../hooks/useSendAnyHttpRequest";
 import { useSidebarHidden } from "../hooks/useSidebarHidden";
 import { getWebsocketRequestActions } from "../hooks/useWebsocketRequestActions";
 import { deepEqualAtom } from "../lib/atoms";
 import { showConfirm } from "../lib/confirm";
+import { copyRequestAsCurl } from "../lib/curl";
+import { showCurlPanel } from "../lib/curlPanel";
 import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
 import { showDialog } from "../lib/dialog";
-import {
-  gitWorktreeStatusByModelIdAtom,
-  gitWorktreeStatusFamily,
-} from "../lib/gitWorktreeStatus";
+import { gitWorktreeStatusByModelIdAtom, gitWorktreeStatusFamily } from "../lib/gitWorktreeStatus";
 import { jotaiStore } from "../lib/jotai";
+import { setKeyValue } from "../lib/keyValueStore";
 import { resolvedModelName } from "../lib/resolvedModelName";
 import { isSidebarFocused } from "../lib/scopes";
 import { navigateToRequestOrFolderOrWorkspace } from "../lib/setWorkspaceSearchParams";
@@ -90,9 +92,27 @@ const collapsedFamily = atomFamily((treeId: string) => {
   return atomWithKVStorage<Record<string, boolean>>(key, {});
 });
 
-type SidebarModel = Workspace | Folder | HttpRequest | GrpcRequest | WebsocketRequest;
+type RequestGroup = {
+  id: "saved_requests" | "history_requests";
+  model: "request_group";
+  name: string;
+};
+type RequestHistoryItem = {
+  id: string;
+  model: "request_history";
+  name: string;
+  response: HttpResponse;
+};
+type SidebarModel =
+  | Workspace
+  | Folder
+  | HttpRequest
+  | GrpcRequest
+  | WebsocketRequest
+  | RequestGroup
+  | RequestHistoryItem;
 function isSidebarLeafModel(m: AnyModel): boolean {
-  const modelMap: Record<Exclude<SidebarModel["model"], "workspace">, null> = {
+  const modelMap: Record<"http_request" | "grpc_request" | "websocket_request" | "folder", null> = {
     http_request: null,
     grpc_request: null,
     websocket_request: null,
@@ -101,8 +121,29 @@ function isSidebarLeafModel(m: AnyModel): boolean {
   return m.model in modelMap;
 }
 
+function isRealSidebarModel(
+  item: SidebarModel,
+): item is Exclude<SidebarModel, RequestGroup | RequestHistoryItem | Workspace> | Workspace {
+  return item.model !== "request_group" && item.model !== "request_history";
+}
+
+const savedRequestsGroup: RequestGroup = {
+  id: "saved_requests",
+  model: "request_group",
+  name: "Collections",
+};
+
+const historyRequestsGroup: RequestGroup = {
+  id: "history_requests",
+  model: "request_group",
+  name: "History",
+};
+
 const OPACITY_SUBTLE = "opacity-80";
 
+savedRequestsGroup.name = "Collections";
+historyRequestsGroup.name = "History";
+
 function Sidebar({ className }: { className?: string }) {
   const [hidden, setHidden] = useSidebarHidden();
   const activeWorkspaceId = useAtomValue(activeWorkspaceAtom)?.id;
@@ -180,8 +221,21 @@ function Sidebar({ className }: { className?: string }) {
     children: SidebarModel[];
     insertAt: number;
   }) {
-    const prev = children[insertAt - 1] as Exclude<SidebarModel, Workspace>;
-    const next = children[insertAt] as Exclude<SidebarModel, Workspace>;
+    if (
+      parent.model === "request_group" ||
+      parent.model === "request_history" ||
+      items.some((item) => item.model === "request_group" || item.model === "request_history")
+    ) {
+      return;
+    }
+    const prev = children[insertAt - 1] as Exclude<
+      SidebarModel,
+      Workspace | RequestGroup | RequestHistoryItem
+    >;
+    const next = children[insertAt] as Exclude<
+      SidebarModel,
+      Workspace | RequestGroup | RequestHistoryItem
+    >;
     const folderId = parent.model === "folder" ? parent.id : null;
 
     const beforePriority = prev?.sortPriority ?? 0;
@@ -193,13 +247,15 @@ function Sidebar({ className }: { className?: string }) {
         // Add items to children at insertAt
         children.splice(insertAt, 0, ...items);
         await Promise.all(
-          children.map((m, i) => patchModel(m, { sortPriority: i * 1000, folderId })),
+          children
+            .filter(isRealSidebarModel)
+            .map((m, i) => patchModel(m, { sortPriority: i * 1000, folderId })),
         );
       } else {
         const range = afterPriority - beforePriority;
         const increment = range / (items.length + 2);
         await Promise.all(
-          items.map((m, i) =>
+          items.filter(isRealSidebarModel).map((m, i) =>
             // Spread item sortPriority out over before/after range
             patchModel(m, {
               sortPriority: beforePriority + (i + 1) * increment,
@@ -260,21 +316,33 @@ function Sidebar({ className }: { className?: string }) {
   );
 
   const handleRenameSelected = useCallback((items: SidebarModel[]) => {
-    if (items.length === 1 && items[0] != null) {
+    if (
+      items.length === 1 &&
+      items[0] != null &&
+      items[0].model !== "request_group" &&
+      items[0].model !== "request_history"
+    ) {
       treeRef.current?.renameItem(items[0].id);
     }
   }, []);
 
   const handleDeleteSelected = useCallback(async (items: SidebarModel[]) => {
-    await deleteModelWithConfirm(items);
+    await deleteModelWithConfirm(
+      items.filter((item) => item.model !== "request_group" && item.model !== "request_history"),
+    );
   }, []);
 
   const handleDuplicateSelected = useCallback(async (items: SidebarModel[]) => {
     if (items.length === 1 && items[0]) {
+      if (items[0].model === "request_group" || items[0].model === "request_history") return;
       const newId = await duplicateModel(items[0]);
       navigateToRequestOrFolderOrWorkspace(newId, items[0].model);
     } else {
-      await Promise.all(items.map(duplicateModel));
+      await Promise.all(
+        items
+          .filter((item) => item.model !== "request_group" && item.model !== "request_history")
+          .map(duplicateModel),
+      );
     }
   }, []);
 
@@ -390,6 +458,20 @@ function Sidebar({ className }: { className?: string }) {
         });
       }
 
+      if (child.model === "request_group") {
+        return [];
+      }
+
+      if (child.model === "request_history") {
+        return [
+          {
+            label: "Open Response",
+            leftSlot: <Icon icon="history" />,
+            onSelect: () => activateHistoryResponse(child),
+          },
+        ];
+      }
+
       const workspaces = jotaiStore.get(workspacesAtom);
       const syncDir = jotaiStore.get(activeWorkspaceMetaAtom)?.settingSyncDir;
       const gitItems = getGitContextMenuItems({ items, syncDir });
@@ -400,6 +482,10 @@ function Sidebar({ className }: { className?: string }) {
           i.model === "grpc_request" ||
           i.model === "websocket_request",
       );
+      const httpRequestActions =
+        items.length === 1 && child.model === "http_request"
+          ? (await getHttpRequestActions()).filter((a) => a.label !== "Copy as Curl")
+          : [];
 
       const initialItems: ContextMenuProps["items"] = [
         {
@@ -416,10 +502,39 @@ function Sidebar({ className }: { className?: string }) {
           leftSlot: <Icon icon="send_horizontal" />,
           onSelect: () => handleSendSelected(items),
         },
-        ...(items.length === 1 && child.model === "http_request"
-          ? await getHttpRequestActions()
-          : []
-        ).map((a) => ({
+        {
+          label: "Copy as Curl",
+          leftSlot: <Icon icon="copy" />,
+          hidden: !(items.length === 1 && child.model === "http_request"),
+          onSelect: async () => {
+            if (child.model !== "http_request") return;
+            const request = getModel("http_request", child.id);
+            if (request != null) await copyRequestAsCurl(request);
+          },
+        },
+        {
+          label: "View Curl",
+          leftSlot: <Icon icon="square_terminal" />,
+          hidden: !(items.length === 1 && child.model === "http_request"),
+          onSelect: () => {
+            if (child.model !== "http_request") return;
+            navigateToRequestOrFolderOrWorkspace(child.id, child.model);
+            showCurlPanel(child.id);
+          },
+        },
+        {
+          label: "Save Request",
+          leftSlot: <Icon icon="save" />,
+          hidden:
+            !(items.length === 1 && child.model === "http_request") ||
+            (child.model === "http_request" && child.isSaved === true),
+          onSelect: async () => {
+            if (child.model === "http_request") {
+              await patchModel(child, { isSaved: true });
+            }
+          },
+        },
+        ...httpRequestActions.map((a) => ({
           label: a.label,
           leftSlot: <Icon icon={a.icon ?? "empty"} />,
           onSelect: async () => {
@@ -745,6 +860,7 @@ function getGitContextMenuItems({
 }
 
 function syncPathForModel(item: SidebarModel) {
+  if (item.model === "request_history") return null;
   return `yaak.${item.id}.yaml`;
 }
 
@@ -757,22 +873,46 @@ function getEditOptions(
 ): ReturnType<NonNullable<TreeItemProps<SidebarModel>["getEditOptions"]>> {
   return {
     onChange: handleSubmitEdit,
-    defaultValue: resolvedModelName(item),
+    defaultValue:
+      item.model === "request_group" || item.model === "request_history"
+        ? item.name
+        : resolvedModelName(item),
     placeholder: item.name,
   };
 }
 
 async function handleSubmitEdit(item: SidebarModel, text: string) {
+  if (item.model === "request_group" || item.model === "request_history") return;
   await patchModel(item, { name: text });
 }
 
 function handleActivate(item: SidebarModel) {
   // TODO: Add folder layout support
-  if (item.model !== "folder" && item.model !== "workspace") {
+  if (item.model === "request_history") {
+    void activateHistoryResponse(item);
+    return;
+  }
+  if (item.model !== "folder" && item.model !== "workspace" && item.model !== "request_group") {
     navigateToRequestOrFolderOrWorkspace(item.id, item.model);
   }
 }
 
+async function activateHistoryResponse(item: RequestHistoryItem) {
+  const request = getModel("http_request", item.response.requestId);
+  if (request == null) return;
+
+  const latestResponse =
+    jotaiStore.get(httpResponsesAtom).find((r) => r.requestId === item.response.requestId) ?? null;
+  if (latestResponse != null) {
+    await setKeyValue({
+      namespace: "global",
+      key: ["pinned_http_response_id", latestResponse.id],
+      value: item.response.id,
+    });
+  }
+  navigateToRequestOrFolderOrWorkspace(request.id, request.model);
+}
+
 const allPotentialChildrenAtom = atom<SidebarModel[]>((get) => {
   const requests = get(allRequestsAtom);
   const folders = get(foldersAtom);
@@ -790,12 +930,18 @@ const sidebarTreeAtom = atom<[TreeNode<SidebarModel>, FieldDef[]] | null>((get)
   const allModels = get(memoAllPotentialChildrenAtom);
   const activeWorkspace = get(activeWorkspaceAtom);
   const filter = get(sidebarFilterAtom);
+  const responses = get(httpResponsesAtom);
 
   const childrenMap: Record<string, Exclude<SidebarModel, Workspace>[]> = {};
   for (const item of allModels) {
+    if (item.model === "http_request" && item.isSaved !== true) {
+      continue;
+    }
     if ("folderId" in item && item.folderId == null) {
-      childrenMap[item.workspaceId] = childrenMap[item.workspaceId] ?? [];
-      childrenMap[item.workspaceId]?.push(item);
+      const parentId =
+        item.workspaceId === activeWorkspace?.id ? savedRequestsGroup.id : item.workspaceId;
+      childrenMap[parentId] = childrenMap[parentId] ?? [];
+      childrenMap[parentId]?.push(item);
     } else if ("folderId" in item && item.folderId != null) {
       childrenMap[item.folderId] = childrenMap[item.folderId] ?? [];
       childrenMap[item.folderId]?.push(item);
@@ -807,6 +953,17 @@ const sidebarTreeAtom = atom<[TreeNode<SidebarModel>, FieldDef[]] | null>((get)
   }
 
   const queryAst = parseQuery(filter.text);
+  childrenMap[activeWorkspace.id] = [savedRequestsGroup, historyRequestsGroup];
+  childrenMap[historyRequestsGroup.id] = responses
+    .filter((response) => response.workspaceId === activeWorkspace.id)
+    .sort((a, b) => (a.createdAt < b.createdAt ? 1 : -1))
+    .slice(0, 500)
+    .map((response) => ({
+      id: response.id,
+      model: "request_history" as const,
+      name: response.url || "HTTP request",
+      response,
+    }));
 
   // returns true if this node OR any child matches the filter
   const allFields: Record<string, Set<string>> = {};
@@ -815,7 +972,7 @@ const sidebarTreeAtom = atom<[TreeNode<SidebarModel>, FieldDef[]] | null>((get)
     let matchesSelf = true;
     const fields = getItemFields(node);
     const model = node.item.model;
-    const isLeafNode = !(model === "folder" || model === "workspace");
+    const isLeafNode = !(model === "folder" || model === "workspace" || model === "request_group");
 
     for (const [field, value] of Object.entries(fields)) {
       if (!value) continue;
@@ -834,7 +991,14 @@ const sidebarTreeAtom = atom<[TreeNode<SidebarModel>, FieldDef[]] | null>((get)
 
     if (node.children != null) {
       childItems.sort((a, b) => {
+        if (node.item.id === historyRequestsGroup.id) {
+          return 0;
+        }
+        if (!("sortPriority" in a) || !("sortPriority" in b)) {
+          return 0;
+        }
         if (a.sortPriority === b.sortPriority) {
+          if (!("updatedAt" in a) || !("updatedAt" in b)) return 0;
           return a.updatedAt > b.updatedAt ? 1 : -1;
         }
         return a.sortPriority - b.sortPriority;
@@ -885,9 +1049,14 @@ const sidebarGitStatusByModelIdAtom = atom<Record<string, GitStatus>>((get) => {
   const statusByModelId: Record<string, GitStatus> = {};
 
   for (const item of allModels) {
+    if (item.model === "http_request" && item.isSaved !== true) {
+      continue;
+    }
     if ("folderId" in item && item.folderId == null) {
-      childrenMap[item.workspaceId] = childrenMap[item.workspaceId] ?? [];
-      childrenMap[item.workspaceId]?.push(item);
+      const parentId =
+        item.workspaceId === activeWorkspace?.id ? savedRequestsGroup.id : item.workspaceId;
+      childrenMap[parentId] = childrenMap[parentId] ?? [];
+      childrenMap[parentId]?.push(item);
     } else if ("folderId" in item && item.folderId != null) {
       childrenMap[item.folderId] = childrenMap[item.folderId] ?? [];
       childrenMap[item.folderId]?.push(item);
@@ -896,7 +1065,8 @@ const sidebarGitStatusByModelIdAtom = atom<Record<string, GitStatus>>((get) => {
 
   const visit = (item: SidebarModel): GitStatus | null => {
     const statuses: GitStatus[] = [];
-    const directStatus = gitStatusByModelId[item.id]?.status;
+    const directStatus =
+      item.model === "request_group" ? null : gitStatusByModelId[item.id]?.status;
     if (directStatus != null && directStatus !== "current") {
       statuses.push(directStatus);
     }
@@ -914,6 +1084,7 @@ const sidebarGitStatusByModelIdAtom = atom<Record<string, GitStatus>>((get) => {
   };
 
   if (activeWorkspace != null) {
+    childrenMap[activeWorkspace.id] = [savedRequestsGroup];
     visit(activeWorkspace);
   }
 
@@ -922,7 +1093,10 @@ const sidebarGitStatusByModelIdAtom = atom<Record<string, GitStatus>>((get) => {
 
 const sidebarGitStatusFamily = atomFamily(
   (modelId: string) =>
-    selectAtom(sidebarGitStatusByModelIdAtom, (statusByModelId) => statusByModelId[modelId] ?? null),
+    selectAtom(
+      sidebarGitStatusByModelIdAtom,
+      (statusByModelId) => statusByModelId[modelId] ?? null,
+    ),
   Object.is,
 );
 
@@ -936,6 +1110,19 @@ function summarizeGitStatuses(statuses: GitStatus[]): GitStatus | null {
 }
 
 function getItemKey(item: SidebarModel) {
+  if (item.model === "request_group") {
+    return item.id;
+  }
+  if (item.model === "request_history") {
+    return [
+      item.id,
+      item.response.url,
+      item.response.status,
+      item.response.state,
+      item.response.createdAt,
+      item.response.updatedAt,
+    ].join("::");
+  }
   const responses = jotaiStore.get(httpResponsesAtom);
   const latestResponse = responses.find((r) => r.requestId === item.id) ?? null;
   const url = "url" in item ? item.url : "n/a";
@@ -959,6 +1146,17 @@ const SidebarLeftSlot = memo(function SidebarLeftSlot({
   treeId: string;
   item: SidebarModel;
 }) {
+  if (item.model === "request_group") {
+    const icon = item.id === savedRequestsGroup.id ? "folder" : "clock";
+    return <Icon icon={icon} className="text-text-subtle" />;
+  }
+  if (item.model === "request_history") {
+    return item.response.state !== "closed" ? (
+      <LoadingIcon size="sm" className="text-text-subtlest" />
+    ) : (
+      <HttpStatusTag short className="text-xs" response={item.response} />
+    );
+  }
   if (item.model === "folder") {
     return <Icon icon="folder" />;
   }
@@ -981,8 +1179,9 @@ const SidebarInnerItem = memo(function SidebarInnerItem({
   treeId: string;
   item: SidebarModel;
 }) {
+  const deleteSendHistory = useDeleteSendHistory();
   const gitStatus = useAtomValue(sidebarGitStatusFamily(item.id));
-  const response = useAtomValue(
+  const latestActivity = useAtomValue(
     useMemo(
       () =>
         selectAtom(
@@ -991,25 +1190,64 @@ const SidebarInnerItem = memo(function SidebarInnerItem({
             ...get(httpResponsesAtom),
             ...get(websocketConnectionsAtom),
           ]),
-          (responses) => responses.find((r) => r.requestId === item.id),
+          (responses) =>
+            item.model === "request_history"
+              ? item.response
+              : responses.find((r) => r.requestId === item.id),
           (a, b) => a?.state === b?.state && a?.id === b?.id, // Only update when the response state changes updated
         ),
-      [item.id],
+      [item],
     ),
   );
+  const historyTime =
+    item.model === "request_history"
+      ? formatHistoryTimestamp(item.response.createdAt)
+      : item.model === "http_request" && item.isSaved !== true
+        ? formatHistoryTimestamp(item.historyUpdatedAt ?? item.updatedAt)
+        : null;
+  const itemName =
+    item.model === "request_group"
+      ? item.name
+      : item.model === "request_history"
+        ? item.response.url || item.name
+        : resolvedModelName(item);
+  const response =
+    item.model === "request_history"
+      ? null
+      : latestActivity != null && "state" in latestActivity
+        ? latestActivity
+        : null;
+  const displayGitStatus = item.model === "request_history" ? null : gitStatus;
 
   return (
     <div className="flex items-center gap-2 min-w-0 h-full w-full text-left">
       <div
         className={classNames(
           "truncate",
-          gitStatus === "modified" && "text-info",
-          gitStatus === "untracked" && "text-success",
-          gitStatus === "removed" && "text-danger",
+          item.model === "request_group" && "text-xs font-semibold text-text-subtle",
+          item.model === "request_history" && "text-xs text-text-subtle",
+          displayGitStatus === "modified" && "text-info",
+          displayGitStatus === "untracked" && "text-success",
+          displayGitStatus === "removed" && "text-danger",
         )}
       >
-        {resolvedModelName(item)}
+        {itemName}
       </div>
+      {item.model === "request_group" && item.id === historyRequestsGroup.id && (
+        <IconButton
+          size="xs"
+          icon="trash"
+          title="Clear history"
+          className="ml-auto text-text-subtle hover:text-danger"
+          onClick={(e) => {
+            e.stopPropagation();
+            deleteSendHistory.mutate();
+          }}
+        />
+      )}
+      {historyTime != null && (
+        <div className="ml-auto text-xs text-text-subtlest">{historyTime}</div>
+      )}
       {response != null && (
         <div className="ml-auto">
           {response.state !== "closed" ? (
@@ -1023,14 +1261,35 @@ const SidebarInnerItem = memo(function SidebarInnerItem({
   );
 });
 
+function formatHistoryTimestamp(value: string): string {
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return "";
+  return date.toLocaleString([], {
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+}
+
 function getItemFields(node: TreeNode<SidebarModel>): Record<string, string> {
   const item = node.item;
 
-  if (item.model === "workspace") return {};
+  if (item.model === "workspace" || item.model === "request_group") return {};
 
   const fields: Record<string, string> = {};
+  if (item.model === "request_history") {
+    fields.url = item.response.url;
+    fields.status = `${item.response.status}`;
+    fields.history = item.response.createdAt;
+    fields.type = "http";
+    fields.name = item.name;
+    return fields;
+  }
+
   if (item.model === "http_request") {
     fields.method = item.method.toUpperCase();
+    if (item.historyUpdatedAt) fields.history = item.historyUpdatedAt;
   }
 
   if (item.model === "grpc_request") {
@@ -1053,6 +1312,12 @@ function getItemFields(node: TreeNode<SidebarModel>): Record<string, string> {
 }
 
 function getItemText(item: SidebarModel): string {
+  if (item.model === "request_group") {
+    return item.name;
+  }
+  if (item.model === "request_history") {
+    return [item.response.status, item.response.url || item.name].join(" ");
+  }
   const segments = [];
   if (item.model === "http_request") {
     segments.push(item.method);
diff --git a/apps/yaak-client/components/Workspace.tsx b/apps/yaak-client/components/Workspace.tsx
index f1b503f41..9a4c094ba 100644
--- a/apps/yaak-client/components/Workspace.tsx
+++ b/apps/yaak-client/components/Workspace.tsx
@@ -27,6 +27,7 @@ import { useSubscribeRecentRequests } from "../hooks/useRecentRequests";
 import { useSubscribeRecentWorkspaces } from "../hooks/useRecentWorkspaces";
 import { useSidebarHidden } from "../hooks/useSidebarHidden";
 import { useSidebarWidth } from "../hooks/useSidebarWidth";
+import { useSubscribeRequestTabs } from "../hooks/useRequestTabs";
 import { useSyncWorkspaceRequestTitle } from "../hooks/useSyncWorkspaceRequestTitle";
 import { duplicateRequestOrFolderAndNavigate } from "../lib/duplicateRequestOrFolderAndNavigate";
 import { importData } from "../lib/importData";
@@ -40,6 +41,7 @@ import { ErrorBoundary } from "./ErrorBoundary";
 import { FolderLayout } from "./FolderLayout";
 import { GrpcConnectionLayout } from "./GrpcConnectionLayout";
 import { HttpRequestLayout } from "./HttpRequestLayout";
+import { RequestTabs } from "./RequestTabs";
 import Sidebar from "./Sidebar";
 import { SidebarActions } from "./SidebarActions";
 import { WebsocketRequestLayout } from "./WebsocketRequestLayout";
@@ -93,9 +95,18 @@ export function Workspace() {
   );
 
   const workspaceBody = (
-    <ErrorBoundary name="Workspace Body">
-      <WorkspaceBody />
-    </ErrorBoundary>
+    <div className="flex flex-col h-full w-full min-w-0">
+      <ErrorBoundary name="Request Tabs">
+        <RequestTabs />
+      </ErrorBoundary>
+      {/* Plain block wrapper so the body layout's `gridArea: "body"` style is ignored
+          (a grid parent here would mis-place the request pane). */}
+      <div className="flex-1 min-h-0 min-w-0">
+        <ErrorBoundary name="Workspace Body">
+          <WorkspaceBody />
+        </ErrorBoundary>
+      </div>
+    </div>
   );
 
   const sidebarContent = floating ? (
@@ -206,6 +217,7 @@ function useGlobalWorkspaceHooks() {
   useEnsureActiveCookieJar();
 
   useSubscribeActiveRequestId();
+  useSubscribeRequestTabs();
   useSubscribeActiveFolderId();
   useSubscribeActiveEnvironmentId();
   useSubscribeActiveCookieJarId();
diff --git a/apps/yaak-client/components/WorkspaceHeader.tsx b/apps/yaak-client/components/WorkspaceHeader.tsx
index 5c79057e3..02e88bd19 100644
--- a/apps/yaak-client/components/WorkspaceHeader.tsx
+++ b/apps/yaak-client/components/WorkspaceHeader.tsx
@@ -2,9 +2,12 @@ import { HStack, Icon } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { useAtom, useAtomValue } from "jotai";
 import { memo } from "react";
+import { patchModel } from "@yaakapp-internal/models";
 import { activeWorkspaceAtom, activeWorkspaceMetaAtom } from "../hooks/useActiveWorkspace";
+import { activeRequestAtom } from "../hooks/useActiveRequest";
 import { useToggleCommandPalette } from "../hooks/useToggleCommandPalette";
 import { workspaceLayoutAtom } from "../lib/atoms";
+import { curlPanelRequestIdAtom, hideCurlPanel, showCurlPanel } from "../lib/curlPanel";
 import { setupOrConfigureEncryption } from "../lib/setupOrConfigureEncryption";
 import { CookieDropdown } from "./CookieDropdown";
 import { IconButton } from "./core/IconButton";
@@ -29,7 +32,13 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({
   const togglePalette = useToggleCommandPalette();
   const [workspaceLayout, setWorkspaceLayout] = useAtom(workspaceLayoutAtom);
   const workspace = useAtomValue(activeWorkspaceAtom);
+  const activeRequest = useAtomValue(activeRequestAtom);
+  const curlPanelRequestId = useAtomValue(curlPanelRequestIdAtom);
   const workspaceMeta = useAtomValue(activeWorkspaceMetaAtom);
+  const showCurlButton = activeRequest?.model === "http_request";
+  const showSaveRequestButton =
+    activeRequest?.model === "http_request" && activeRequest.isSaved !== true;
+  const curlPanelOpen = showCurlButton && curlPanelRequestId === activeRequest.id;
   const showEncryptionSetup =
     workspace != null &&
     workspaceMeta != null &&
@@ -64,6 +73,24 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({
         ) : (
           <LicenseBadge />
         )}
+        {showCurlButton && (
+          <IconButton
+            icon="square_terminal"
+            title="View Curl"
+            size="sm"
+            iconColor="secondary"
+            onClick={() => (curlPanelOpen ? hideCurlPanel() : showCurlPanel(activeRequest.id))}
+          />
+        )}
+        {showSaveRequestButton && (
+          <IconButton
+            icon="save"
+            title="Save Request"
+            size="sm"
+            iconColor="secondary"
+            onClick={() => patchModel(activeRequest, { isSaved: true })}
+          />
+        )}
         <IconButton
           icon={
             workspaceLayout === "responsive"
diff --git a/apps/yaak-client/hooks/useRequestTabs.ts b/apps/yaak-client/hooks/useRequestTabs.ts
new file mode 100644
index 000000000..49c53b75a
--- /dev/null
+++ b/apps/yaak-client/hooks/useRequestTabs.ts
@@ -0,0 +1,86 @@
+import { useAtomValue } from "jotai";
+import { useEffect, useRef } from "react";
+import {
+  EMPTY_REQUEST_TABS_STATE,
+  ensureTabReducer,
+  pruneTabsReducer,
+  REQUEST_TABS_NAMESPACE,
+  requestTabsKey,
+  type RequestTabsState,
+  updateRequestTabsState,
+} from "../lib/requestTabs";
+import { activeRequestIdAtom } from "./useActiveRequestId";
+import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
+import { allRequestsAtom } from "./useAllRequests";
+import { useKeyValue } from "./useKeyValue";
+
+function useRequestTabsKeyValue() {
+  const workspaceId = useAtomValue(activeWorkspaceIdAtom);
+  return useKeyValue<RequestTabsState>({
+    namespace: REQUEST_TABS_NAMESPACE,
+    key: requestTabsKey(workspaceId ?? "n/a"),
+    fallback: EMPTY_REQUEST_TABS_STATE,
+  });
+}
+
+/** Reactive read of the current workspace's request tab state. */
+export function useRequestTabsState(): RequestTabsState {
+  const { value } = useRequestTabsKeyValue();
+  return value ?? EMPTY_REQUEST_TABS_STATE;
+}
+
+/**
+ * Keeps the request tab bar in sync with navigation. Mounted once in the
+ * Workspace. Responsibilities:
+ *  - Open the active request as a preview tab whenever it changes (covers every
+ *    navigation source: sidebar, command palette, recent dropdown, create, …).
+ *  - Prune tabs whose request was deleted.
+ *  - Pin the preview tab the first time its request is edited.
+ */
+export function useSubscribeRequestTabs() {
+  const workspaceId = useAtomValue(activeWorkspaceIdAtom);
+  const activeRequestId = useAtomValue(activeRequestIdAtom);
+  const allRequests = useAtomValue(allRequestsAtom);
+  const { value } = useRequestTabsKeyValue();
+  const previewTabId = value?.previewTabId ?? null;
+
+  // Ensure the active request is represented as its own persistent tab so that
+  // opening multiple requests accumulates tabs side-by-side.
+  useEffect(() => {
+    if (workspaceId == null || activeRequestId == null) return;
+    void updateRequestTabsState(workspaceId, (s) => ensureTabReducer(s, activeRequestId, true));
+  }, [workspaceId, activeRequestId]);
+
+  // Drop tabs for requests that no longer exist
+  useEffect(() => {
+    if (workspaceId == null) return;
+    const existing = new Set(allRequests.map((r) => r.id));
+    void updateRequestTabsState(workspaceId, (s) => pruneTabsReducer(s, existing));
+  }, [workspaceId, allRequests]);
+
+  // Pin the preview tab once its request is edited (updatedAt changes)
+  const baselineRef = useRef<{ id: string; updatedAt: string } | null>(null);
+  useEffect(() => {
+    if (previewTabId == null) {
+      baselineRef.current = null;
+      return;
+    }
+    const req = allRequests.find((r) => r.id === previewTabId);
+    if (req == null) return;
+
+    // First time we see this preview: record its baseline, don't pin
+    if (baselineRef.current?.id !== previewTabId) {
+      baselineRef.current = { id: previewTabId, updatedAt: req.updatedAt };
+      return;
+    }
+
+    if (baselineRef.current.updatedAt !== req.updatedAt) {
+      baselineRef.current = null;
+      if (workspaceId != null) {
+        void updateRequestTabsState(workspaceId, (s) =>
+          s.previewTabId === previewTabId ? { ...s, previewTabId: null } : s,
+        );
+      }
+    }
+  }, [workspaceId, allRequests, previewTabId]);
+}
diff --git a/apps/yaak-client/hooks/useSendAnyHttpRequest.ts b/apps/yaak-client/hooks/useSendAnyHttpRequest.ts
index d62edfe8f..45026e5e4 100644
--- a/apps/yaak-client/hooks/useSendAnyHttpRequest.ts
+++ b/apps/yaak-client/hooks/useSendAnyHttpRequest.ts
@@ -13,7 +13,6 @@ export function useSendAnyHttpRequest() {
       if (request == null) {
         return null;
       }
-
       return invokeCmd("cmd_send_http_request", {
         request,
         environmentId: getActiveEnvironment()?.id,
@@ -30,7 +29,6 @@ export const sendAnyHttpRequest = createFastMutation<HttpResponse | null, string
     if (request == null) {
       return null;
     }
-
     return invokeCmd("cmd_send_http_request", {
       request,
       environmentId: getActiveEnvironment()?.id,
diff --git a/apps/yaak-client/lib/createRequestAndNavigate.tsx b/apps/yaak-client/lib/createRequestAndNavigate.tsx
index 7e229fcac..04c5871de 100644
--- a/apps/yaak-client/lib/createRequestAndNavigate.tsx
+++ b/apps/yaak-client/lib/createRequestAndNavigate.tsx
@@ -19,6 +19,11 @@ export async function createRequestAndNavigate<
     }
   }
   patch.folderId = patch.folderId || activeRequest?.folderId;
+  if (patch.model === "http_request") {
+    Object.assign(patch, {
+      isSaved: false,
+    });
+  }
 
   const newId = await createWorkspaceModel(patch);
 
diff --git a/apps/yaak-client/lib/curl.ts b/apps/yaak-client/lib/curl.ts
new file mode 100644
index 000000000..67e8e9099
--- /dev/null
+++ b/apps/yaak-client/lib/curl.ts
@@ -0,0 +1,180 @@
+import type { HttpRequest } from "@yaakapp-internal/models";
+import type { RenderPurpose } from "@yaakapp-internal/plugins";
+import { activeEnvironmentAtom } from "../hooks/useActiveEnvironment";
+import { copyToClipboard } from "./copy";
+import { invokeCmd } from "./tauri";
+import { jotaiStore } from "./jotai";
+import { showToast } from "./toast";
+
+const NEWLINE = "\\\n ";
+
+export async function requestToCurl(
+  request: HttpRequest,
+  purpose: RenderPurpose = "send",
+): Promise<string> {
+  const environmentId = jotaiStore.get(activeEnvironmentAtom)?.id ?? null;
+  const renderedRequest = await invokeCmd<HttpRequest>("cmd_render_http_request", {
+    httpRequest: request,
+    environmentId,
+    purpose,
+  });
+  return convertToCurl(renderedRequest);
+}
+
+export async function copyRequestAsCurl(request: HttpRequest): Promise<void> {
+  try {
+    copyToClipboard(await requestToCurl(request));
+  } catch (err) {
+    console.error(err);
+    showToast({
+      id: "failed-to-copy-curl",
+      color: "danger",
+      icon: "copy",
+      message: "Failed to copy curl command",
+    });
+  }
+}
+
+export function convertToCurl(request: Partial<HttpRequest>) {
+  const xs = ["curl"];
+  const authentication = request.authentication as Record<string, unknown> | undefined;
+
+  if (request.method) xs.push("-X", request.method);
+
+  let finalUrl = request.url || "";
+  const urlParams = (request.urlParameters ?? []).filter(onlyEnabled);
+  if (urlParams.length > 0) {
+    const [base, hash] = finalUrl.split("#");
+    const separator = base?.includes("?") ? "&" : "?";
+    const queryString = urlParams
+      .map((p) => `${encodeURIComponent(p.name)}=${encodeURIComponent(p.value)}`)
+      .join("&");
+    finalUrl = base + separator + queryString + (hash ? `#${hash}` : "");
+  }
+
+  if (request.authenticationType === "apikey") {
+    if (authentication?.location === "query") {
+      const sep = finalUrl.includes("?") ? "&" : "?";
+      finalUrl = [
+        finalUrl,
+        sep,
+        encodeURIComponent(String(authentication?.key ?? "token")),
+        "=",
+        encodeURIComponent(String(authentication?.value ?? "")),
+      ].join("");
+    } else {
+      request.headers = request.headers ?? [];
+      request.headers.push({
+        name: String(authentication?.key ?? "X-Api-Key"),
+        value: String(authentication?.value ?? ""),
+        enabled: true,
+        id: "",
+      });
+    }
+  }
+
+  xs.push(quote(finalUrl));
+  xs.push(NEWLINE);
+
+  for (const h of (request.headers ?? []).filter(onlyEnabled)) {
+    xs.push("--header", quote(`${h.name}: ${h.value}`));
+    xs.push(NEWLINE);
+  }
+
+  const type = request.bodyType ?? "none";
+  if (
+    (type === "multipart/form-data" || type === "application/x-www-form-urlencoded") &&
+    Array.isArray(request.body?.form)
+  ) {
+    const flag = request.bodyType === "multipart/form-data" ? "--form" : "--data";
+    for (const p of (request.body.form ?? []).filter(onlyEnabled)) {
+      if (p.file) {
+        let v = `${p.name}=@${p.file}`;
+        v += p.contentType ? `;type=${p.contentType}` : "";
+        xs.push(flag, v);
+      } else {
+        xs.push(flag, quote(`${p.name}=${p.value}`));
+      }
+      xs.push(NEWLINE);
+    }
+  } else if (type === "graphql" && typeof request.body?.query === "string") {
+    const body = {
+      query: request.body.query || "",
+      variables: maybeParseJSON(request.body.variables, undefined),
+    };
+    xs.push("--data", quote(JSON.stringify(body)));
+    xs.push(NEWLINE);
+  } else if (type !== "none" && typeof request.body?.text === "string") {
+    xs.push("--data", quote(request.body.text));
+    xs.push(NEWLINE);
+  }
+
+  if (authentication?.disabled !== true) {
+    if (request.authenticationType === "basic" || request.authenticationType === "digest") {
+      if (request.authenticationType === "digest") xs.push("--digest");
+      xs.push(
+        "--user",
+        quote(
+          `${String(authentication?.username ?? "")}:${String(authentication?.password ?? "")}`,
+        ),
+      );
+      xs.push(NEWLINE);
+    }
+
+    if (request.authenticationType === "bearer") {
+      const value =
+        `${String(authentication?.prefix ?? "Bearer")} ${String(authentication?.token ?? "")}`.trim();
+      xs.push("--header", quote(`Authorization: ${value}`));
+      xs.push(NEWLINE);
+    }
+
+    if (request.authenticationType === "auth-aws-sig-v4") {
+      xs.push(
+        "--aws-sigv4",
+        [
+          "aws",
+          "amz",
+          String(authentication?.region ?? ""),
+          String(authentication?.service ?? ""),
+        ].join(":"),
+      );
+      xs.push(NEWLINE);
+      xs.push(
+        "--user",
+        quote(
+          `${String(authentication?.accessKeyId ?? "")}:${String(
+            authentication?.secretAccessKey ?? "",
+          )}`,
+        ),
+      );
+      if (authentication?.sessionToken) {
+        xs.push(NEWLINE);
+        xs.push("--header", quote(`X-Amz-Security-Token: ${String(authentication.sessionToken)}`));
+      }
+      xs.push(NEWLINE);
+    }
+  }
+
+  if (xs[xs.length - 1] === NEWLINE) {
+    xs.splice(xs.length - 1, 1);
+  }
+
+  return xs.join(" ");
+}
+
+function quote(arg: string): string {
+  const escaped = arg.replace(/'/g, "\\'");
+  return `'${escaped}'`;
+}
+
+function onlyEnabled(v: { name?: string; enabled?: boolean }): boolean {
+  return v.enabled !== false && !!v.name;
+}
+
+function maybeParseJSON<T>(v: string, fallback: T) {
+  try {
+    return JSON.parse(v);
+  } catch {
+    return fallback;
+  }
+}
diff --git a/apps/yaak-client/lib/curlPanel.ts b/apps/yaak-client/lib/curlPanel.ts
new file mode 100644
index 000000000..5f7ce1e43
--- /dev/null
+++ b/apps/yaak-client/lib/curlPanel.ts
@@ -0,0 +1,12 @@
+import { atom } from "jotai";
+import { jotaiStore } from "./jotai";
+
+export const curlPanelRequestIdAtom = atom<string | null>(null);
+
+export function showCurlPanel(requestId: string) {
+  jotaiStore.set(curlPanelRequestIdAtom, requestId);
+}
+
+export function hideCurlPanel() {
+  jotaiStore.set(curlPanelRequestIdAtom, null);
+}
diff --git a/apps/yaak-client/lib/requestTabs.ts b/apps/yaak-client/lib/requestTabs.ts
new file mode 100644
index 000000000..e74153d7e
--- /dev/null
+++ b/apps/yaak-client/lib/requestTabs.ts
@@ -0,0 +1,173 @@
+import { activeRequestIdAtom } from "../hooks/useActiveRequestId";
+import { jotaiStore } from "./jotai";
+import { getKeyValue, setKeyValue } from "./keyValueStore";
+import { setWorkspaceSearchParams } from "./setWorkspaceSearchParams";
+
+/**
+ * State for the Postman-style request tab bar. Persisted per-workspace in the
+ * `no_sync` key-value namespace so open tabs survive app restarts.
+ *
+ * `tabs` is the ordered list of open request IDs. `previewTabId` is the single
+ * ephemeral "preview" tab (shown in italics) that gets replaced when another
+ * request is opened by a single click, à la Postman/VSCode. Editing the request
+ * or double-clicking the tab "pins" it by clearing `previewTabId`.
+ */
+export interface RequestTabsState {
+  tabs: string[];
+  previewTabId: string | null;
+}
+
+export const REQUEST_TABS_NAMESPACE = "no_sync" as const;
+
+export const EMPTY_REQUEST_TABS_STATE: RequestTabsState = { tabs: [], previewTabId: null };
+
+export function requestTabsKey(workspaceId: string): string[] {
+  return ["request_tabs", workspaceId];
+}
+
+export function getRequestTabsState(workspaceId: string): RequestTabsState {
+  return getKeyValue<RequestTabsState>({
+    namespace: REQUEST_TABS_NAMESPACE,
+    key: requestTabsKey(workspaceId),
+    fallback: EMPTY_REQUEST_TABS_STATE,
+  });
+}
+
+/**
+ * Read-modify-write the tab state for a workspace. Reads fresh from the store
+ * (rather than a captured React value) so concurrent effects don't clobber each
+ * other. No-ops when the reducer returns the same reference.
+ */
+export async function updateRequestTabsState(
+  workspaceId: string,
+  reducer: (prev: RequestTabsState) => RequestTabsState,
+): Promise<void> {
+  const prev = getRequestTabsState(workspaceId);
+  const next = reducer(prev);
+  if (next === prev) return;
+  await setKeyValue({
+    namespace: REQUEST_TABS_NAMESPACE,
+    key: requestTabsKey(workspaceId),
+    value: next,
+  });
+}
+
+/**
+ * Ensure a request is represented as a tab. When `pin` is false (the default for
+ * single-click navigation) the request opens as the preview tab, replacing any
+ * existing preview in place. When `pin` is true it always becomes a pinned tab.
+ */
+export function ensureTabReducer(
+  state: RequestTabsState,
+  id: string,
+  pin: boolean,
+): RequestTabsState {
+  if (state.tabs.includes(id)) {
+    if (pin && state.previewTabId === id) {
+      return { ...state, previewTabId: null };
+    }
+    return state;
+  }
+
+  if (pin) {
+    return { tabs: [...state.tabs, id], previewTabId: state.previewTabId };
+  }
+
+  // Open as the preview tab, replacing the existing preview in place
+  if (state.previewTabId != null && state.tabs.includes(state.previewTabId)) {
+    return {
+      tabs: state.tabs.map((t) => (t === state.previewTabId ? id : t)),
+      previewTabId: id,
+    };
+  }
+
+  return { tabs: [...state.tabs, id], previewTabId: id };
+}
+
+export function removeTabReducer(state: RequestTabsState, id: string): RequestTabsState {
+  if (!state.tabs.includes(id)) return state;
+  return {
+    tabs: state.tabs.filter((t) => t !== id),
+    previewTabId: state.previewTabId === id ? null : state.previewTabId,
+  };
+}
+
+/** Drop tabs whose request no longer exists (e.g. deleted from the sidebar). */
+export function pruneTabsReducer(
+  state: RequestTabsState,
+  existingIds: Set<string>,
+): RequestTabsState {
+  const tabs = state.tabs.filter((id) => existingIds.has(id));
+  if (tabs.length === state.tabs.length) return state;
+  return {
+    tabs,
+    previewTabId:
+      state.previewTabId != null && existingIds.has(state.previewTabId) ? state.previewTabId : null,
+  };
+}
+
+/** The tab to activate after `id` is closed: prefer the one to the right. */
+export function neighborTabId(tabs: string[], id: string): string | null {
+  const idx = tabs.indexOf(id);
+  if (idx === -1) return null;
+  return tabs[idx + 1] ?? tabs[idx - 1] ?? null;
+}
+
+/** Navigate to (activate) a request tab. */
+export function activateRequestTab(id: string) {
+  setWorkspaceSearchParams({ request_id: id, folder_id: null });
+}
+
+export async function closeRequestTab(workspaceId: string, id: string): Promise<void> {
+  const { tabs } = getRequestTabsState(workspaceId);
+  const wasActive = jotaiStore.get(activeRequestIdAtom) === id;
+  const neighbor = neighborTabId(tabs, id);
+
+  await updateRequestTabsState(workspaceId, (s) => removeTabReducer(s, id));
+
+  if (wasActive) {
+    setWorkspaceSearchParams({ request_id: neighbor, folder_id: null });
+  }
+}
+
+export async function closeOtherRequestTabs(workspaceId: string, id: string): Promise<void> {
+  await updateRequestTabsState(workspaceId, (s) =>
+    s.tabs.includes(id) ? { tabs: [id], previewTabId: s.previewTabId === id ? id : null } : s,
+  );
+  if (jotaiStore.get(activeRequestIdAtom) !== id) {
+    setWorkspaceSearchParams({ request_id: id, folder_id: null });
+  }
+}
+
+export async function closeRequestTabsToRight(workspaceId: string, id: string): Promise<void> {
+  const { tabs } = getRequestTabsState(workspaceId);
+  const idx = tabs.indexOf(id);
+  if (idx === -1) return;
+  const keep = new Set(tabs.slice(0, idx + 1));
+
+  await updateRequestTabsState(workspaceId, (s) => ({
+    tabs: s.tabs.filter((t) => keep.has(t)),
+    previewTabId: s.previewTabId != null && keep.has(s.previewTabId) ? s.previewTabId : null,
+  }));
+
+  const activeId = jotaiStore.get(activeRequestIdAtom);
+  if (activeId != null && !keep.has(activeId)) {
+    setWorkspaceSearchParams({ request_id: id, folder_id: null });
+  }
+}
+
+export async function closeAllRequestTabs(workspaceId: string): Promise<void> {
+  await updateRequestTabsState(workspaceId, () => ({ ...EMPTY_REQUEST_TABS_STATE }));
+  setWorkspaceSearchParams({ request_id: null, folder_id: null });
+}
+
+/** Pin a preview tab so it stops being ephemeral. */
+export async function pinRequestTab(workspaceId: string, id: string): Promise<void> {
+  await updateRequestTabsState(workspaceId, (s) =>
+    s.previewTabId === id ? { ...s, previewTabId: null } : s,
+  );
+}
+
+export async function reorderRequestTabs(workspaceId: string, newOrder: string[]): Promise<void> {
+  await updateRequestTabsState(workspaceId, (s) => ({ ...s, tabs: newOrder }));
+}
diff --git a/apps/yaak-client/lib/tauri.ts b/apps/yaak-client/lib/tauri.ts
index dc875b37d..6871fd8c7 100644
--- a/apps/yaak-client/lib/tauri.ts
+++ b/apps/yaak-client/lib/tauri.ts
@@ -44,6 +44,7 @@ type TauriCmd =
   | "cmd_plugin_info"
   | "cmd_plugin_init_errors"
   | "cmd_reload_plugins"
+  | "cmd_render_http_request"
   | "cmd_render_template"
   | "cmd_save_response"
   | "cmd_secure_template"
diff --git a/crates-tauri/yaak-app-client/src/lib.rs b/crates-tauri/yaak-app-client/src/lib.rs
index ff3f1fe44..2762a2868 100644
--- a/crates-tauri/yaak-app-client/src/lib.rs
+++ b/crates-tauri/yaak-app-client/src/lib.rs
@@ -7,9 +7,10 @@ use crate::http_request::{resolve_http_request, send_http_request};
 use crate::import::import_data;
 use crate::models_ext::{BlobManagerExt, QueryManagerExt};
 use crate::notifications::YaakNotifier;
-use crate::render::{render_grpc_request, render_json_value, render_template};
+use crate::render::{render_grpc_request, render_http_request, render_json_value, render_template};
 use crate::updates::{UpdateMode, UpdateTrigger, YaakUpdater};
 use crate::uri_scheme::handle_deep_link;
+use chrono::Utc;
 use error::Result as YaakResult;
 use eventsource_client::{EventParser, SSE};
 use log::{debug, error, info, warn};
@@ -269,6 +270,36 @@ async fn cmd_render_template<R: Runtime>(
     Ok(result)
 }
 
+#[tauri::command]
+async fn cmd_render_http_request<R: Runtime>(
+    window: WebviewWindow<R>,
+    app_handle: AppHandle<R>,
+    http_request: HttpRequest,
+    environment_id: Option<&str>,
+    purpose: Option<RenderPurpose>,
+) -> YaakResult<HttpRequest> {
+    let resolved_request = resolve_http_request(&window, &http_request)?.0;
+    let environment_chain = app_handle.db().resolve_environments(
+        &resolved_request.workspace_id,
+        resolved_request.folder_id.as_deref(),
+        environment_id,
+    )?;
+    let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
+    let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
+    Ok(render_http_request(
+        &resolved_request,
+        environment_chain,
+        &PluginTemplateCallback::new(
+            plugin_manager,
+            encryption_manager,
+            &window.plugin_context(),
+            purpose.unwrap_or(RenderPurpose::Preview),
+        ),
+        &RenderOptions { error_behavior: RenderErrorBehavior::Throw },
+    )
+    .await?)
+}
+
 #[tauri::command]
 async fn cmd_dismiss_notification<R: Runtime>(
     window: WebviewWindow<R>,
@@ -295,7 +326,8 @@ async fn cmd_grpc_reflect<R: Runtime>(
         unrendered_request.folder_id.as_deref(),
         environment_id,
     )?;
-    let resolved_settings = app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
+    let resolved_settings =
+        app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
 
     let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
     let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
@@ -353,7 +385,8 @@ async fn cmd_grpc_go<R: Runtime>(
         unrendered_request.folder_id.as_deref(),
         environment_id,
     )?;
-    let resolved_settings = app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
+    let resolved_settings =
+        app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
 
     let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
     let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
@@ -1431,13 +1464,22 @@ async fn cmd_send_http_request<R: Runtime>(
     request: HttpRequest,
 ) -> YaakResult<HttpResponse> {
     let blobs = app_handle.blob_manager();
+    let source = UpdateSource::from_window_label(window.label());
+    if !request.id.is_empty() {
+        if let Ok(mut persisted_request) = app_handle.db().get_http_request(&request.id) {
+            persisted_request.history_updated_at = Some(Utc::now().naive_utc());
+            app_handle.db().upsert_http_request(&persisted_request, &source)?;
+        }
+    }
+    let saved_request_id = if request.is_saved { Some(request.id.clone()) } else { None };
     let response = app_handle.db().upsert_http_response(
         &HttpResponse {
             request_id: request.id.clone(),
+            saved_request_id,
             workspace_id: request.workspace_id.clone(),
             ..Default::default()
         },
-        &UpdateSource::from_window_label(window.label()),
+        &source,
         &blobs,
     )?;
 
@@ -1483,7 +1525,7 @@ async fn cmd_send_http_request<R: Runtime>(
                     error: Some(e.to_string()),
                     ..resp
                 },
-                &UpdateSource::from_window_label(window.label()),
+                &source,
                 &blobs,
             )?
         }
@@ -1792,6 +1834,7 @@ pub fn run() {
             cmd_new_main_window,
             cmd_plugin_info,
             cmd_reload_plugins,
+            cmd_render_http_request,
             cmd_render_template,
             cmd_restart,
             cmd_save_response,
diff --git a/crates/yaak-models/migrations/20260618000000_request-history-save-state.sql b/crates/yaak-models/migrations/20260618000000_request-history-save-state.sql
new file mode 100644
index 000000000..0c81a79fc
--- /dev/null
+++ b/crates/yaak-models/migrations/20260618000000_request-history-save-state.sql
@@ -0,0 +1,2 @@
+ALTER TABLE http_requests ADD COLUMN is_saved BOOLEAN DEFAULT TRUE NOT NULL;
+ALTER TABLE http_requests ADD COLUMN history_updated_at TEXT;
diff --git a/crates/yaak-models/migrations/20260618001000_http-response-saved-request-id.sql b/crates/yaak-models/migrations/20260618001000_http-response-saved-request-id.sql
new file mode 100644
index 000000000..d1e0ce837
--- /dev/null
+++ b/crates/yaak-models/migrations/20260618001000_http-response-saved-request-id.sql
@@ -0,0 +1 @@
+ALTER TABLE http_responses ADD COLUMN saved_request_id TEXT;
diff --git a/crates/yaak-models/src/models.rs b/crates/yaak-models/src/models.rs
index ac4fa367b..a356869c4 100644
--- a/crates/yaak-models/src/models.rs
+++ b/crates/yaak-models/src/models.rs
@@ -1,9 +1,9 @@
 use crate::error::Result;
 use crate::models::HttpRequestIden::{
     Authentication, AuthenticationType, Body, BodyType, CreatedAt, Description, FolderId, Headers,
-    Method, Name, SettingFollowRedirects, SettingRequestTimeout, SettingSendCookies,
-    SettingStoreCookies, SettingValidateCertificates, SortPriority, UpdatedAt, Url, UrlParameters,
-    WorkspaceId,
+    HistoryUpdatedAt, IsSaved, Method, Name, SettingFollowRedirects, SettingRequestTimeout,
+    SettingSendCookies, SettingStoreCookies, SettingValidateCertificates, SortPriority, UpdatedAt,
+    Url, UrlParameters, WorkspaceId,
 };
 use crate::util::generate_prefixed_id;
 use chrono::{NaiveDateTime, Utc};
@@ -1118,6 +1118,8 @@ pub struct HttpRequest {
     #[serde(default = "default_http_method")]
     pub method: String,
     pub name: String,
+    pub is_saved: bool,
+    pub history_updated_at: Option<NaiveDateTime>,
     pub sort_priority: f64,
     pub url: String,
     /// URL parameters used for both path placeholders (`:id`) and query string entries.
@@ -1169,6 +1171,8 @@ impl UpsertModelInfo for HttpRequest {
             (Authentication, serde_json::to_string(&self.authentication)?.into()),
             (AuthenticationType, self.authentication_type.into()),
             (Headers, serde_json::to_string(&self.headers)?.into()),
+            (IsSaved, self.is_saved.into()),
+            (HistoryUpdatedAt, self.history_updated_at.into()),
             (SortPriority, self.sort_priority.into()),
             (SettingSendCookies, serde_json::to_string(&self.setting_send_cookies)?.into()),
             (SettingStoreCookies, serde_json::to_string(&self.setting_store_cookies)?.into()),
@@ -1196,6 +1200,8 @@ impl UpsertModelInfo for HttpRequest {
             AuthenticationType,
             Url,
             UrlParameters,
+            IsSaved,
+            HistoryUpdatedAt,
             SortPriority,
             SettingSendCookies,
             SettingStoreCookies,
@@ -1230,6 +1236,8 @@ impl UpsertModelInfo for HttpRequest {
             headers: serde_json::from_str(headers.as_str()).unwrap_or_default(),
             method: row.get("method")?,
             name: row.get("name")?,
+            is_saved: row.get("is_saved")?,
+            history_updated_at: row.get("history_updated_at")?,
             sort_priority: row.get("sort_priority")?,
             url: row.get("url")?,
             url_parameters: serde_json::from_str(url_parameters.as_str()).unwrap_or_default(),
@@ -1643,6 +1651,7 @@ pub struct HttpResponse {
     pub updated_at: NaiveDateTime,
     pub workspace_id: String,
     pub request_id: String,
+    pub saved_request_id: Option<String>,
 
     pub body_path: Option<String>,
     pub content_length: Option<i32>,
@@ -1692,6 +1701,7 @@ impl UpsertModelInfo for HttpResponse {
             (CreatedAt, upsert_date(source, self.created_at)),
             (UpdatedAt, upsert_date(source, self.updated_at)),
             (RequestId, self.request_id.into()),
+            (SavedRequestId, self.saved_request_id.into()),
             (WorkspaceId, self.workspace_id.into()),
             (BodyPath, self.body_path.into()),
             (ContentLength, self.content_length.into()),
@@ -1715,6 +1725,7 @@ impl UpsertModelInfo for HttpResponse {
     fn update_columns() -> Vec<impl IntoIden> {
         vec![
             HttpResponseIden::UpdatedAt,
+            HttpResponseIden::SavedRequestId,
             HttpResponseIden::BodyPath,
             HttpResponseIden::ContentLength,
             HttpResponseIden::ContentLengthCompressed,
@@ -1745,6 +1756,7 @@ impl UpsertModelInfo for HttpResponse {
             model: r.get("model")?,
             workspace_id: r.get("workspace_id")?,
             request_id: r.get("request_id")?,
+            saved_request_id: r.get("saved_request_id").unwrap_or_default(),
             created_at: r.get("created_at")?,
             updated_at: r.get("updated_at")?,
             error: r.get("error")?,
diff --git a/crates/yaak-models/src/queries/http_responses.rs b/crates/yaak-models/src/queries/http_responses.rs
index d12824189..4b9ebf652 100644
--- a/crates/yaak-models/src/queries/http_responses.rs
+++ b/crates/yaak-models/src/queries/http_responses.rs
@@ -84,14 +84,15 @@ impl<'a> ClientDb<'a> {
         source: &UpdateSource,
         blob_manager: &BlobManager,
     ) -> Result<HttpResponse> {
-        let responses = self.list_http_responses_for_request(&http_response.request_id, None)?;
+        let response = self.upsert(http_response, source)?;
+        let responses = self.list_http_responses(&http_response.workspace_id, None)?;
 
-        for m in responses.iter().skip(MAX_HISTORY_ITEMS - 1) {
+        for m in responses.iter().skip(MAX_HISTORY_ITEMS) {
             debug!("Deleting old HTTP response {}", http_response.id);
             self.delete_http_response(&m, source, blob_manager)?;
         }
 
-        self.upsert(http_response, source)
+        Ok(response)
     }
 
     pub fn cancel_pending_http_responses(&self) -> Result<()> {
diff --git a/crates/yaak-models/src/queries/mod.rs b/crates/yaak-models/src/queries/mod.rs
index a27361b48..3ecb79ce1 100644
--- a/crates/yaak-models/src/queries/mod.rs
+++ b/crates/yaak-models/src/queries/mod.rs
@@ -23,7 +23,7 @@ mod workspace_metas;
 pub mod workspaces;
 pub use model_changes::PersistedModelChange;
 
-const MAX_HISTORY_ITEMS: usize = 20;
+const MAX_HISTORY_ITEMS: usize = 500;
 
 use crate::models::HttpRequestHeader;
 use std::collections::HashMap;