diff --git a/client/src/api/client.ts b/client/src/api/client.ts
index c9f5697..2188fdd 100644
--- a/client/src/api/client.ts
+++ b/client/src/api/client.ts
@@ -162,8 +162,8 @@ export const environments = {
 // ── Sessions ──────────────────────────────────────────────────────────────────
 
 export const sessions = {
-  list(page = 1, limit = 50): Promise<PaginatedResponse<Session>> {
-    return request(`/sessions?page=${page}&limit=${limit}`);
+  list(page = 1, limit = 50, orderBy = 'id', orderDir: 'ASC' | 'DESC' = 'DESC'): Promise<PaginatedResponse<Session>> {
+    return request(`/sessions?page=${page}&limit=${limit}&orderBy=${orderBy}&orderDir=${orderDir}`);
   },
   get(id: string): Promise<Session> {
     return request(`/sessions/${id}`);
@@ -176,8 +176,13 @@ export const sessions = {
 // ── Scenarios ─────────────────────────────────────────────────────────────────
 
 export const scenarios = {
-  list(page = 1, limit = 50): Promise<PaginatedResponse<Scenario>> {
-    return request(`/scenarios?page=${page}&limit=${limit}&orderBy=updatedAt&orderDir=DESC`);
+  list(
+    page = 1,
+    limit = 50,
+    orderBy = 'updatedAt',
+    orderDir: 'ASC' | 'DESC' = 'DESC',
+  ): Promise<PaginatedResponse<Scenario>> {
+    return request(`/scenarios?page=${page}&limit=${limit}&orderBy=${orderBy}&orderDir=${orderDir}`);
   },
   get(id: string): Promise<Scenario & { steps: ScenarioStep[] }> {
     return request(`/scenarios/${id}`);
@@ -245,12 +250,14 @@ export const runs = {
     page = 1,
     limit = 20,
     status?: string,
+    orderBy = 'createdAt',
+    orderDir: 'ASC' | 'DESC' = 'DESC',
   ): Promise<
     PaginatedResponse<
       ScenarioRun & { stepRuns: ScenarioRunStep[]; scenario: { id: string; name: string } }
     >
   > {
-    const q = new URLSearchParams({ page: String(page), limit: String(limit) });
+    const q = new URLSearchParams({ page: String(page), limit: String(limit), orderBy, orderDir });
     if (status) q.set('status', status);
     return request(`/scenarios/runs?${q}`);
   },
@@ -258,8 +265,10 @@ export const runs = {
     scenarioId: string,
     page = 1,
     limit = 20,
+    orderBy = 'createdAt',
+    orderDir: 'ASC' | 'DESC' = 'DESC',
   ): Promise<PaginatedResponse<ScenarioRun & { stepRuns: ScenarioRunStep[] }>> {
-    return request(`/scenarios/${scenarioId}/runs?page=${page}&limit=${limit}`);
+    return request(`/scenarios/${scenarioId}/runs?page=${page}&limit=${limit}&orderBy=${orderBy}&orderDir=${orderDir}`);
   },
   get(scenarioId: string, runId: string, q?: string): Promise<ScenarioRunDetail> {
     const qs = q?.trim() ? `?q=${encodeURIComponent(q.trim())}` : '';
diff --git a/client/src/pages/run/AllRunsPage.tsx b/client/src/pages/run/AllRunsPage.tsx
index f9732e7..f153cd5 100644
--- a/client/src/pages/run/AllRunsPage.tsx
+++ b/client/src/pages/run/AllRunsPage.tsx
@@ -1,9 +1,10 @@
+import { useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { Activity } from 'lucide-react';
 import { runs } from '../../api';
-import type { ScenarioRun, ScenarioRunStep, ScenarioRunStatus } from '../../api';
+import type { ScenarioRun, ScenarioRunStatus } from '../../api';
 import {
   AutoRefreshIndicator,
   Badge,
@@ -12,6 +13,7 @@ import {
   Timestamp,
   UuidBadge,
   type TableColumn,
+  type SortDirection,
 } from '../../ui';
 import type { BadgeVariant } from '../../ui';
 import styles from '../Page.module.css';
@@ -31,7 +33,6 @@ const STATUS_LABEL: Record<ScenarioRunStatus, string> = {
 };
 
 type AllRunRow = ScenarioRun & {
-  stepRuns: ScenarioRunStep[];
   scenario: { id: number; name: string };
 };
 
@@ -39,26 +40,46 @@ export function AllRunsPage() {
   const { t } = useTranslation();
   const navigate = useNavigate();
 
+  const [sortBy, setSortBy] = useState('createdAt');
+  const [sortDir, setSortDir] = useState<SortDirection>('desc');
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(20);
+
   const {
-    data: items = [],
+    data,
     isLoading,
     error,
     refetch,
-  } = useQuery<AllRunRow[]>({
-    queryKey: ['runs'],
-    queryFn: async () => {
-      const res = await runs.listAll();
-      return res.data as AllRunRow[];
-    },
+  } = useQuery({
+    queryKey: ['runs', sortBy, sortDir, page, pageSize],
+    queryFn: () =>
+      runs.listAll(page, pageSize, undefined, sortBy, sortDir === 'asc' ? 'ASC' : 'DESC'),
     refetchInterval: 10_000,
     staleTime: 0,
   });
 
+  const items = (data?.data ?? []) as AllRunRow[];
+  const total = data?.total ?? 0;
+
+  const handleSort = (key: string, dir: SortDirection) => {
+    setSortBy(key);
+    setSortDir(dir);
+    setPage(1);
+  };
+
+  const handlePageChange = (p: number) => setPage(p);
+
+  const handlePageSizeChange = (size: number) => {
+    setPageSize(size);
+    setPage(1);
+  };
+
   const columns: TableColumn<AllRunRow>[] = [
     { key: 'id', header: t('runs.col_id'), render: (r) => <UuidBadge id={r.id} />, width: 60 },
     {
-      key: 'scenario',
+      key: 'scenario.name',
       header: t('runs.col_scenario'),
+      sortable: true,
       render: (r) => (
         <span
           className={styles.linkCell}
@@ -75,18 +96,14 @@ export function AllRunsPage() {
       key: 'status',
       header: t('runs.col_status'),
       width: 110,
+      sortable: true,
       render: (r) => <Badge variant={STATUS_VARIANT[r.status]}>{STATUS_LABEL[r.status]}</Badge>,
     },
     {
-      key: 'steps',
-      header: t('runs.col_steps'),
-      width: 80,
-      render: (r) => r.stepRuns.length,
-    },
-    {
-      key: 'created',
+      key: 'createdAt',
       header: t('runs.col_created'),
       width: 160,
+      sortable: true,
       render: (r) => <Timestamp value={r.createdAt} />,
     },
   ];
@@ -109,9 +126,16 @@ export function AllRunsPage() {
         rowKey={(r) => r.id}
         loading={isLoading}
         emptyMessage={t('runs.empty')}
-        pageSize={20}
+        pageSize={pageSize}
         pageSizeOptions={[10, 20, 50]}
         onRowClick={(r) => navigate(`/scenarios/${r.scenarioId}/runs/${r.id}`)}
+        sortBy={sortBy}
+        sortDir={sortDir}
+        onSort={handleSort}
+        total={total}
+        page={page}
+        onPageChange={handlePageChange}
+        onPageSizeChange={handlePageSizeChange}
       />
     </div>
   );
diff --git a/client/src/pages/run/RunsPage.tsx b/client/src/pages/run/RunsPage.tsx
index 6f7759b..f765838 100644
--- a/client/src/pages/run/RunsPage.tsx
+++ b/client/src/pages/run/RunsPage.tsx
@@ -7,7 +7,6 @@ import type {
   Environment,
   Scenario,
   ScenarioRun,
-  ScenarioRunStep,
   ScenarioRunStatus,
 } from '../../api';
 import {
@@ -22,6 +21,7 @@ import {
   UuidBadge,
   useToast,
   type TableColumn,
+  type SortDirection,
 } from '../../ui';
 import type { BadgeVariant } from '../../ui';
 import styles from '../Page.module.css';
@@ -40,7 +40,7 @@ const STATUS_LABEL: Record<ScenarioRunStatus, string> = {
   fail: 'Fail',
 };
 
-type RunRow = ScenarioRun & { stepRuns: ScenarioRunStep[] };
+type RunRow = ScenarioRun;
 
 export function RunsPage() {
   const { t } = useTranslation();
@@ -60,29 +60,74 @@ export function RunsPage() {
   const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
   const hasDataRef = useRef(false);
 
-  const load = useCallback(() => {
-    if (!id) return;
-    if (!hasDataRef.current) setLoading(true);
-    Promise.all([scenarios.get(id!), runs.list(id!)])
+  const [sortBy, setSortBy] = useState('createdAt');
+  const [sortDir, setSortDir] = useState<SortDirection>('desc');
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(20);
+  const [total, setTotal] = useState(0);
+
+  // Keep refs so the poll interval always reads current values
+  const sortByRef = useRef(sortBy);
+  const sortDirRef = useRef(sortDir);
+  const pageRef = useRef(page);
+  const pageSizeRef = useRef(pageSize);
+  sortByRef.current = sortBy;
+  sortDirRef.current = sortDir;
+  pageRef.current = page;
+  pageSizeRef.current = pageSize;
+
+  const load = useCallback(
+    (orderBy: string, orderDir: SortDirection, p: number, limit: number) => {
+      if (!id) return;
+      if (!hasDataRef.current) setLoading(true);
+      Promise.all([
+        scenarios.get(id!),
+        runs.list(id!, p, limit, orderBy, orderDir === 'asc' ? 'ASC' : 'DESC'),
+      ])
       .then(([sc, res]) => {
         setScenario(sc);
         setItems(res.data);
+        setTotal(res.total);
         setError(null);
         setPulseKey((k) => k + 1);
         hasDataRef.current = true;
       })
       .catch((err: Error) => setError(err.message))
       .finally(() => setLoading(false));
-  }, [id]);
+    },
+    [id],
+  );
 
   useEffect(() => {
-    load();
-    pollRef.current = setInterval(load, 10_000);
+    load('createdAt', 'desc', 1, 20);
+    pollRef.current = setInterval(
+      () => load(sortByRef.current, sortDirRef.current, pageRef.current, pageSizeRef.current),
+      10_000,
+    );
     return () => {
       if (pollRef.current) clearInterval(pollRef.current);
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [load]);
 
+  const handleSort = (key: string, dir: SortDirection) => {
+    setSortBy(key);
+    setSortDir(dir);
+    setPage(1);
+    load(key, dir, 1, pageSize);
+  };
+
+  const handlePageChange = (p: number) => {
+    setPage(p);
+    load(sortBy, sortDir, p, pageSize);
+  };
+
+  const handlePageSizeChange = (size: number) => {
+    setPageSize(size);
+    setPage(1);
+    load(sortBy, sortDir, 1, size);
+  };
+
   useEffect(() => {
     environments
       .list(1, 200)
@@ -117,18 +162,14 @@ export function RunsPage() {
       key: 'status',
       header: t('runs.col_status'),
       width: 100,
+      sortable: true,
       render: (r) => <Badge variant={STATUS_VARIANT[r.status]}>{STATUS_LABEL[r.status]}</Badge>,
     },
     {
-      key: 'steps',
-      header: t('runs.col_steps'),
-      width: 80,
-      render: (r) => r.stepRuns.length,
-    },
-    {
-      key: 'created',
+      key: 'createdAt',
       header: t('runs.col_created'),
       width: 160,
+      sortable: true,
       render: (r) => <Timestamp value={r.createdAt} />,
     },
   ];
@@ -151,7 +192,7 @@ export function RunsPage() {
           ]}
         />
         <div className={styles.toolbarActions}>
-          <AutoRefreshIndicator active pulseKey={pulseKey} error={!!error} onClick={load} />
+          <AutoRefreshIndicator active pulseKey={pulseKey} error={!!error} onClick={() => load(sortBy, sortDir, page, pageSize)} />
           <Button size="sm" onClick={() => setRunModalOpen(true)}>
             <Play size={14} />
             {t('runs.action_run')}
@@ -165,9 +206,16 @@ export function RunsPage() {
         rowKey={(r) => r.id}
         loading={loading}
         emptyMessage={t('runs.empty')}
-        pageSize={20}
+        pageSize={pageSize}
         pageSizeOptions={[10, 20, 50]}
         onRowClick={(r) => navigate(`/scenarios/${id}/runs/${r.id}`)}
+        sortBy={sortBy}
+        sortDir={sortDir}
+        onSort={handleSort}
+        total={total}
+        page={page}
+        onPageChange={handlePageChange}
+        onPageSizeChange={handlePageSizeChange}
       />
 
       <Modal
diff --git a/client/src/pages/scenario/ScenariosPage.tsx b/client/src/pages/scenario/ScenariosPage.tsx
index 0186ae2..fafa190 100644
--- a/client/src/pages/scenario/ScenariosPage.tsx
+++ b/client/src/pages/scenario/ScenariosPage.tsx
@@ -12,6 +12,7 @@ import {
   Select,
   Table,
   type TableColumn,
+  type SortDirection,
   Timestamp,
   UuidBadge,
   useToast,
@@ -34,10 +35,22 @@ export function ScenariosPage() {
 
   const fileInputRef = useRef<HTMLInputElement>(null);
 
-  const load = useCallback(() => {
-    Promise.all([scenarios.list(), environments.list(1, 200)])
+  const [sortBy, setSortBy] = useState('updatedAt');
+  const [sortDir, setSortDir] = useState<SortDirection>('desc');
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
+  const [total, setTotal] = useState(0);
+
+  const load = useCallback(
+    (orderBy: string, orderDir: SortDirection, p: number, limit: number) => {
+      setLoading(true);
+      Promise.all([
+        scenarios.list(p, limit, orderBy, orderDir === 'asc' ? 'ASC' : 'DESC'),
+        environments.list(1, 200),
+      ])
       .then(([scenarioRes, envRes]) => {
         setItems(scenarioRes?.data ?? []);
+        setTotal(scenarioRes?.total ?? 0);
         setEnvs(envRes?.data ?? []);
       })
       .catch((err) => {
@@ -47,9 +60,28 @@ export function ScenariosPage() {
   }, [toast]);
 
   useEffect(() => {
-    load();
+    load('updatedAt', 'desc', 1, 10);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [load]);
 
+  const handleSort = (key: string, dir: SortDirection) => {
+    setSortBy(key);
+    setSortDir(dir);
+    setPage(1);
+    load(key, dir, 1, pageSize);
+  };
+
+  const handlePageChange = (p: number) => {
+    setPage(p);
+    load(sortBy, sortDir, p, pageSize);
+  };
+
+  const handlePageSizeChange = (size: number) => {
+    setPageSize(size);
+    setPage(1);
+    load(sortBy, sortDir, 1, size);
+  };
+
   const openRunModal = (id: string) => {
     setRunScenarioId(id);
     const scenario = items.find((s) => s.id === id);
@@ -79,8 +111,7 @@ export function ScenariosPage() {
     setDeleting(true);
     try {
       await scenarios.remove(deleteId);
-      setLoading(true);
-      load();
+      load(sortBy, sortDir, page, pageSize);
       setDeleteId(null);
     } finally {
       setDeleting(false);
@@ -103,11 +134,12 @@ export function ScenariosPage() {
 
   const columns: TableColumn<Scenario>[] = [
     { key: 'id', header: t('scenarios.col_id'), render: (s) => <UuidBadge id={s.id} />, width: 60 },
-    { key: 'name', header: t('scenarios.col_name'), render: (s) => s.name },
+    { key: 'name', header: t('scenarios.col_name'), render: (s) => s.name, sortable: true },
     {
-      key: 'updated',
+      key: 'updatedAt',
       header: t('scenarios.col_updated'),
       width: 140,
+      sortable: true,
       render: (s) => <Timestamp value={s.updatedAt} />,
     },
     {
@@ -171,9 +203,16 @@ export function ScenariosPage() {
         rowKey={(s) => s.id}
         loading={loading}
         emptyMessage={t('scenarios.empty')}
-        pageSize={10}
+        pageSize={pageSize}
         pageSizeOptions={[10, 25, 50]}
         onRowClick={(s) => navigate(`/scenarios/${s.id}`)}
+        sortBy={sortBy}
+        sortDir={sortDir}
+        onSort={handleSort}
+        total={total}
+        page={page}
+        onPageChange={handlePageChange}
+        onPageSizeChange={handlePageSizeChange}
       />
 
       <Modal
diff --git a/client/src/pages/session/SessionsPage.tsx b/client/src/pages/session/SessionsPage.tsx
index e96b818..e5b179b 100644
--- a/client/src/pages/session/SessionsPage.tsx
+++ b/client/src/pages/session/SessionsPage.tsx
@@ -10,6 +10,7 @@ import {
   Button,
   Table,
   type TableColumn,
+  type SortDirection,
   Timestamp,
   UuidBadge,
 } from '../../ui';
@@ -23,25 +24,36 @@ export function SessionsPage() {
   const [loading, setLoading] = useState(true);
   const [deleteId, setDeleteId] = useState<string | null>(null);
   const [deleting, setDeleting] = useState(false);
+  const [sortBy, setSortBy] = useState('id');
+  const [sortDir, setSortDir] = useState<SortDirection>('desc');
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
+  const [total, setTotal] = useState(0);
 
-  const load = useCallback(() => {
+  const load = useCallback((orderBy: string, orderDir: SortDirection, p: number, limit: number) => {
+    setLoading(true);
     sessions
-      .list()
-      .then((res) => setItems(res.data))
+      .list(p, limit, orderBy, orderDir === 'asc' ? 'ASC' : 'DESC')
+      .then((res) => { setItems(res.data); setTotal(res.total); })
       .finally(() => setLoading(false));
   }, []);
 
   useEffect(() => {
-    load();
-  }, [load]);
+    load(sortBy, sortDir, page, pageSize);
+  }, [load, sortBy, sortDir, page, pageSize]);
+
+  const handleSort = (col: string, dir: SortDirection) => {
+    setSortBy(col);
+    setSortDir(dir);
+    setPage(1);
+  };
 
   const handleDelete = async () => {
     if (!deleteId) return;
     setDeleting(true);
     try {
       await sessions.remove(deleteId);
-      setLoading(true);
-      load();
+      load(sortBy, sortDir, page, pageSize);
       setDeleteId(null);
     } finally {
       setDeleting(false);
@@ -50,17 +62,19 @@ export function SessionsPage() {
 
   const columns: TableColumn<Session>[] = [
     { key: 'id', header: t('sessions.col_id'), render: (s) => <UuidBadge id={s.id} />, width: 60 },
-    { key: 'name', header: t('sessions.col_name'), render: (s) => s.sessionName },
+    { key: 'sessionName', header: t('sessions.col_name'), sortable: true, render: (s) => s.sessionName },
     {
       key: 'status',
       header: t('sessions.col_status'),
       width: 100,
+      sortable: true,
       render: (s) => <Badge variant={s.status === 'open' ? 'success' : 'error'}>{s.status}</Badge>,
     },
     {
-      key: 'lastUsed',
+      key: 'lastUsedAt',
       header: t('sessions.col_lastUsed'),
       width: 160,
+      sortable: true,
       render: (s) => (s.lastUsedAt ? <Timestamp value={s.lastUsedAt} /> : '—'),
     },
     {
@@ -95,7 +109,13 @@ export function SessionsPage() {
         rowKey={(s) => s.id}
         loading={loading}
         emptyMessage={t('sessions.empty')}
-        pageSize={10}
+        sortBy={sortBy}
+        sortDir={sortDir}
+        onSort={handleSort}
+        total={total}
+        page={page}
+        onPageChange={setPage}
+        onPageSizeChange={(s) => { setPageSize(s); setPage(1); }}
         pageSizeOptions={[10, 25, 50]}
         onRowClick={(s) => navigate(`/sessions/${s.id}`)}
       />
diff --git a/client/src/ui/Table/Table.module.css b/client/src/ui/Table/Table.module.css
index f8245bd..ff09134 100644
--- a/client/src/ui/Table/Table.module.css
+++ b/client/src/ui/Table/Table.module.css
@@ -27,11 +27,40 @@
   background: var(--color-secondary-fg);
 }
 
+.thContent {
+  display: inline-flex;
+  align-items: center;
+  gap: var(--space-1);
+}
+
+.thSortable {
+  cursor: pointer;
+  user-select: none;
+}
+
+.thSortable:hover {
+  background: color-mix(in srgb, var(--color-secondary-fg) 80%, var(--color-secondary-border) 20%);
+}
+
+.sortIcon {
+  opacity: 0.4;
+  flex-shrink: 0;
+}
+
+.sortIconActive {
+  opacity: 1;
+  color: var(--color-primary);
+}
+
 [data-theme="dark"] .th {
   background: var(--color-secondary);
   color: var(--color-secondary-fg);
 }
 
+[data-theme="dark"] .thSortable:hover {
+  background: color-mix(in srgb, var(--color-secondary) 80%, var(--color-secondary-border) 20%);
+}
+
 /* Rounded top corners on first/last header cells */
 .th:first-child { border-radius: var(--radius-lg) 0 0 0; }
 .th:last-child  { border-radius: 0 var(--radius-lg) 0 0; }
diff --git a/client/src/ui/Table/Table.tsx b/client/src/ui/Table/Table.tsx
index 98d23e9..186df2f 100644
--- a/client/src/ui/Table/Table.tsx
+++ b/client/src/ui/Table/Table.tsx
@@ -1,13 +1,18 @@
 import { useState, type HTMLAttributes, type MouseEvent, type ReactNode } from 'react';
+import { ArrowUp, ArrowDown, ArrowUpDown } from 'lucide-react';
 import { Pagination } from '../Pagination/Pagination';
 import styles from './Table.module.css';
 
+export type SortDirection = 'asc' | 'desc';
+
 export interface TableColumn<T> {
   key: string;
   header: ReactNode;
   render: (row: T) => ReactNode;
   width?: string | number;
   align?: 'left' | 'center' | 'right';
+  /** If true, a sort icon is shown and clicking the header triggers onSort */
+  sortable?: boolean;
 }
 
 export interface TableProps<T> {
@@ -17,7 +22,10 @@ export interface TableProps<T> {
   loading?: boolean;
   emptyMessage?: string;
   className?: string;
-  /** Enable built-in client-side pagination with this default page size */
+  /**
+   * Client-side pagination: pass a default page size to enable.
+   * For server-side pagination use `total` + `page` + `onPageChange` instead.
+   */
   pageSize?: number;
   /** Offer a page-size selector when pagination is enabled */
   pageSizeOptions?: number[];
@@ -25,6 +33,21 @@ export interface TableProps<T> {
   onRowClick?: (row: T) => void;
   /** Optional per-row props, useful for drag-and-drop and row-level attributes */
   getRowProps?: (row: T) => HTMLAttributes<HTMLTableRowElement>;
+  /** Currently sorted column key (controlled) */
+  sortBy?: string;
+  /** Current sort direction (controlled) */
+  sortDir?: SortDirection;
+  /** Called when the user clicks a sortable column header */
+  onSort?: (key: string, dir: SortDirection) => void;
+  // ── Server-side pagination (controlled) ──────────────────────────────────
+  /** Total record count from server. Presence switches to server-side pagination mode. */
+  total?: number;
+  /** Controlled current page (1-based). Required when `total` is set. */
+  page?: number;
+  /** Called when the user navigates to a new page. Required when `total` is set. */
+  onPageChange?: (page: number) => void;
+  /** Called when the user changes page size. Optional for server-side pagination. */
+  onPageSizeChange?: (size: number) => void;
 }
 
 export function Table<T>({
@@ -38,34 +61,85 @@ export function Table<T>({
   pageSizeOptions,
   onRowClick,
   getRowProps,
+  sortBy,
+  sortDir,
+  onSort,
+  total,
+  page: controlledPage,
+  onPageChange,
+  onPageSizeChange,
 }: TableProps<T>) {
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(defaultPageSize ?? 0);
+  const [internalPage, setInternalPage] = useState(1);
+  const [pageSize, setPageSize] = useState(defaultPageSize ?? 10);
 
-  const paginated = defaultPageSize !== undefined && !loading;
-  const visibleData = paginated ? data.slice((page - 1) * pageSize, page * pageSize) : data;
+  const serverMode = total !== undefined;
 
-  // Reset to page 1 when data changes and current page would be empty
-  const lastPage = pageSize > 0 ? Math.ceil(data.length / pageSize) : 1;
-  const safePage = Math.min(page, Math.max(1, lastPage));
+  const handleSortClick = (key: string) => {
+    if (!onSort) return;
+    const nextDir: SortDirection =
+      sortBy === key && sortDir === 'asc' ? 'desc' : 'asc';
+    onSort(key, nextDir);
+  };
+
+  // Client-side pagination
+  const clientPaginated = !serverMode && defaultPageSize !== undefined && !loading;
+  const visibleData = clientPaginated
+    ? data.slice((internalPage - 1) * pageSize, internalPage * pageSize)
+    : data;
+
+  const lastClientPage = pageSize > 0 ? Math.ceil(data.length / pageSize) : 1;
+  const safeInternalPage = Math.min(internalPage, Math.max(1, lastClientPage));
+
+  // Server-side pagination display values
+  const serverPage = controlledPage ?? 1;
+  const serverTotal = total ?? 0;
 
   return (
     <div className={`${styles.wrapper} ${className ?? ''}`}>
       <table className={styles.table}>
         <thead>
           <tr>
-            {columns.map((col) => (
-              <th
-                key={col.key}
-                className={styles.th}
-                style={{
-                  width: col.width,
-                  textAlign: col.align ?? 'left',
-                }}
-              >
-                {col.header}
-              </th>
-            ))}
+            {columns.map((col) => {
+              const isSorted = col.sortable && sortBy === col.key;
+              const SortIcon = isSorted
+                ? sortDir === 'asc'
+                  ? ArrowUp
+                  : ArrowDown
+                : ArrowUpDown;
+
+              return (
+                <th
+                  key={col.key}
+                  className={[
+                    styles.th,
+                    col.sortable ? styles.thSortable : '',
+                  ]
+                    .filter(Boolean)
+                    .join(' ')}
+                  style={{
+                    width: col.width,
+                    textAlign: col.align ?? 'left',
+                  }}
+                  onClick={col.sortable ? () => handleSortClick(col.key) : undefined}
+                >
+                  <span className={styles.thContent}>
+                    {col.header}
+                    {col.sortable && (
+                      <SortIcon
+                        size={12}
+                        className={[
+                          styles.sortIcon,
+                          isSorted ? styles.sortIconActive : '',
+                        ]
+                          .filter(Boolean)
+                          .join(' ')}
+                        aria-hidden="true"
+                      />
+                    )}
+                  </span>
+                </th>
+              );
+            })}
           </tr>
         </thead>
         <tbody>
@@ -122,17 +196,39 @@ export function Table<T>({
           )}
         </tbody>
       </table>
-      {paginated && data.length > 0 && (
+      {serverMode && serverTotal > 0 && onPageChange && (
         <Pagination
-          page={safePage}
+          page={serverPage}
+          pageSize={pageSize}
+          total={serverTotal}
+          onPageChange={onPageChange}
+          onPageSizeChange={
+            onPageSizeChange
+              ? (size) => {
+                  setPageSize(size);
+                  onPageSizeChange(size);
+                }
+              : pageSizeOptions
+                ? (size) => {
+                    setPageSize(size);
+                    onPageChange(1);
+                  }
+                : undefined
+          }
+          pageSizeOptions={pageSizeOptions}
+        />
+      )}
+      {clientPaginated && data.length > 0 && (
+        <Pagination
+          page={safeInternalPage}
           pageSize={pageSize}
           total={data.length}
-          onPageChange={setPage}
+          onPageChange={setInternalPage}
           onPageSizeChange={
             pageSizeOptions
               ? (size) => {
                   setPageSize(size);
-                  setPage(1);
+                  setInternalPage(1);
                 }
               : undefined
           }
diff --git a/client/src/ui/index.ts b/client/src/ui/index.ts
index 3866047..db0755b 100644
--- a/client/src/ui/index.ts
+++ b/client/src/ui/index.ts
@@ -62,7 +62,7 @@ export { Modal } from './Modal/Modal';
 export type { ModalProps } from './Modal/Modal';
 
 export { Table } from './Table/Table';
-export type { TableProps, TableColumn } from './Table/Table';
+export type { TableProps, TableColumn, SortDirection } from './Table/Table';
 
 export { UuidBadge } from './UuidBadge/UuidBadge';
 export type { UuidBadgeProps } from './UuidBadge/UuidBadge';
diff --git a/server/src/credential/credential.controller.ts b/server/src/credential/credential.controller.ts
index 529489c..9e21e18 100644
--- a/server/src/credential/credential.controller.ts
+++ b/server/src/credential/credential.controller.ts
@@ -11,8 +11,8 @@ import {
   Query,
 } from "@nestjs/common";
 import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { PaginationQueryDto } from "../common/dto/pagination.dto";
-import { CredentialOrderBy, CredentialService } from "./credential.service";
+import { CredentialQueryDto } from "./dto/credential-query.dto";
+import { CredentialService } from "./credential.service";
 import { CreateCredentialDto } from "./dto/create-credential.dto";
 import { CredentialExportDto } from "./dto/credential-export.dto";
 import { UpdateCredentialDto } from "./dto/update-credential.dto";
@@ -39,7 +39,7 @@ export class CredentialController {
   @Get()
   @ApiOperation({ summary: "List all credentials (paginated)" })
   @ApiResponse({ status: 200, description: "Paginated credentials" })
-  findAll(@Query() query: PaginationQueryDto<CredentialOrderBy>) {
+  findAll(@Query() query: CredentialQueryDto) {
     return this.credentialService.findAll(query);
   }
 
diff --git a/server/src/credential/dto/credential-query.dto.ts b/server/src/credential/dto/credential-query.dto.ts
new file mode 100644
index 0000000..060b2ac
--- /dev/null
+++ b/server/src/credential/dto/credential-query.dto.ts
@@ -0,0 +1,13 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsIn, IsOptional } from "class-validator";
+import { PaginationQueryDto } from "../../common/dto/pagination.dto";
+import { CredentialOrderBy } from "../credential.service";
+
+const CREDENTIAL_ORDER_BY: CredentialOrderBy[] = ["id", "name", "lastUsedAt"];
+
+export class CredentialQueryDto extends PaginationQueryDto<CredentialOrderBy> {
+  @ApiPropertyOptional({ enum: CREDENTIAL_ORDER_BY })
+  @IsOptional()
+  @IsIn(CREDENTIAL_ORDER_BY)
+  declare orderBy?: CredentialOrderBy;
+}
diff --git a/server/src/environment/dto/environment-query.dto.ts b/server/src/environment/dto/environment-query.dto.ts
new file mode 100644
index 0000000..57440cf
--- /dev/null
+++ b/server/src/environment/dto/environment-query.dto.ts
@@ -0,0 +1,13 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsIn, IsOptional } from "class-validator";
+import { PaginationQueryDto } from "../../common/dto/pagination.dto";
+import { EnvironmentOrderBy } from "../environment.service";
+
+const ENVIRONMENT_ORDER_BY: EnvironmentOrderBy[] = ["id", "name", "createdAt", "updatedAt"];
+
+export class EnvironmentQueryDto extends PaginationQueryDto<EnvironmentOrderBy> {
+  @ApiPropertyOptional({ enum: ENVIRONMENT_ORDER_BY })
+  @IsOptional()
+  @IsIn(ENVIRONMENT_ORDER_BY)
+  declare orderBy?: EnvironmentOrderBy;
+}
diff --git a/server/src/environment/environment.controller.ts b/server/src/environment/environment.controller.ts
index 43d02b0..a6dd6ba 100644
--- a/server/src/environment/environment.controller.ts
+++ b/server/src/environment/environment.controller.ts
@@ -11,11 +11,11 @@ import {
   Query,
 } from "@nestjs/common";
 import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { PaginationQueryDto } from "../common/dto/pagination.dto";
+import { EnvironmentQueryDto } from "./dto/environment-query.dto";
 import { CreateEnvironmentDto } from "./dto/create-environment.dto";
 import { EnvironmentExportDto } from "./dto/environment-export.dto";
 import { UpdateEnvironmentDto } from "./dto/update-environment.dto";
-import { EnvironmentOrderBy, EnvironmentService } from "./environment.service";
+import { EnvironmentService } from "./environment.service";
 
 @ApiTags("environments")
 @Controller("environments")
@@ -40,7 +40,7 @@ export class EnvironmentController {
   @Get()
   @ApiOperation({ summary: "List all environments (paginated)" })
   @ApiResponse({ status: 200, description: "Paginated environments" })
-  findAll(@Query() query: PaginationQueryDto<EnvironmentOrderBy>) {
+  findAll(@Query() query: EnvironmentQueryDto) {
     return this.environmentService.findAll(query);
   }
 
diff --git a/server/src/scenario/dto/pagination-query.dto.ts b/server/src/scenario/dto/pagination-query.dto.ts
index 1445957..05f9d52 100644
--- a/server/src/scenario/dto/pagination-query.dto.ts
+++ b/server/src/scenario/dto/pagination-query.dto.ts
@@ -1 +1,15 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsIn, IsOptional } from "class-validator";
+import { PaginationQueryDto } from "../../common/dto/pagination.dto";
+import { ScenarioOrderBy } from "../scenario.service";
+
 export { PaginationQueryDto } from "../../common/dto/pagination.dto";
+
+const SCENARIO_ORDER_BY: ScenarioOrderBy[] = ["id", "name", "createdAt", "updatedAt"];
+
+export class ScenarioQueryDto extends PaginationQueryDto<ScenarioOrderBy> {
+  @ApiPropertyOptional({ enum: SCENARIO_ORDER_BY })
+  @IsOptional()
+  @IsIn(SCENARIO_ORDER_BY)
+  declare orderBy?: ScenarioOrderBy;
+}
diff --git a/server/src/scenario/dto/runs-query.dto.ts b/server/src/scenario/dto/runs-query.dto.ts
index 2100afc..f9d31b8 100644
--- a/server/src/scenario/dto/runs-query.dto.ts
+++ b/server/src/scenario/dto/runs-query.dto.ts
@@ -1,22 +1,17 @@
 import { ApiPropertyOptional } from "@nestjs/swagger";
-import { Type } from "class-transformer";
-import { IsIn, IsInt, IsOptional, Min } from "class-validator";
+import { IsIn, IsOptional } from "class-validator";
 import { RunStatus } from "../scenario-run.entity";
+import { PaginationQueryDto } from "../../common/dto/pagination.dto";
 
-export class RunsQueryDto {
-  @ApiPropertyOptional({ example: 1, default: 1 })
-  @IsOptional()
-  @Type(() => Number)
-  @IsInt()
-  @Min(1)
-  page?: number = 1;
+export type RunOrderBy = "createdAt" | "status" | "scenario.name";
 
-  @ApiPropertyOptional({ example: 20, default: 20 })
+const RUN_ORDER_BY: RunOrderBy[] = ["createdAt", "status", "scenario.name"];
+
+export class RunsQueryDto extends PaginationQueryDto<RunOrderBy> {
+  @ApiPropertyOptional({ enum: RUN_ORDER_BY })
   @IsOptional()
-  @Type(() => Number)
-  @IsInt()
-  @Min(1)
-  limit?: number = 20;
+  @IsIn(RUN_ORDER_BY)
+  declare orderBy?: RunOrderBy;
 
   @ApiPropertyOptional({
     enum: ["pending", "in_progress", "pass", "fail"],
diff --git a/server/src/scenario/scenario.controller.ts b/server/src/scenario/scenario.controller.ts
index 718f1eb..3d6a56c 100644
--- a/server/src/scenario/scenario.controller.ts
+++ b/server/src/scenario/scenario.controller.ts
@@ -18,12 +18,12 @@ import { AddScenarioCredentialDto } from "./dto/add-scenario-credential.dto";
 import { CreateScenarioRunDto } from "./dto/create-scenario-run.dto";
 import { CreateScenarioStepDto } from "./dto/create-scenario-step.dto";
 import { CreateScenarioDto } from "./dto/create-scenario.dto";
-import { PaginationQueryDto } from "./dto/pagination-query.dto";
+import { ScenarioQueryDto } from "./dto/pagination-query.dto";
 import { RunsQueryDto } from "./dto/runs-query.dto";
 import { ExportEntity } from "./dto/scenario-export.dto";
 import { UpdateScenarioStepDto } from "./dto/update-scenario-step.dto";
 import { UpdateScenarioDto } from "./dto/update-scenario.dto";
-import { ScenarioOrderBy, ScenarioService } from "./scenario.service";
+import { ScenarioService } from "./scenario.service";
 
 @ApiTags("scenarios")
 @Controller("scenarios")
@@ -49,7 +49,7 @@ export class ScenarioController {
   @Get()
   @ApiOperation({ summary: "List all scenarios (paginated)" })
   @ApiResponse({ status: 200 })
-  findAll(@Query() query: PaginationQueryDto<ScenarioOrderBy>) {
+  findAll(@Query() query: ScenarioQueryDto) {
     return this.scenarioService.findAll(query);
   }
 
diff --git a/server/src/scenario/scenario.service.ts b/server/src/scenario/scenario.service.ts
index 9c388d2..4a49efc 100644
--- a/server/src/scenario/scenario.service.ts
+++ b/server/src/scenario/scenario.service.ts
@@ -287,12 +287,13 @@ export class ScenarioService {
     await this.findOne(scenarioId); // 404 guard
     const page = query.page ?? 1;
     const limit = query.limit ?? 20;
+    const orderBy = query.orderBy ?? "createdAt";
+    const orderDir = query.orderDir ?? "DESC";
     const where: Record<string, unknown> = { scenarioId };
     if (query.status) where["status"] = query.status;
     const [data, total] = await this.runRepo.findAndCount({
       where,
-      relations: ["stepRuns"],
-      order: { createdAt: "DESC" },
+      order: { [orderBy]: orderDir },
       skip: (page - 1) * limit,
       take: limit,
     });
@@ -306,15 +307,19 @@ export class ScenarioService {
   > {
     const page = query.page ?? 1;
     const limit = query.limit ?? 20;
-    const where: Record<string, unknown> = {};
-    if (query.status) where["status"] = query.status;
-    const [data, total] = await this.runRepo.findAndCount({
-      where,
-      relations: ["stepRuns", "scenario"],
-      order: { createdAt: "DESC" },
-      skip: (page - 1) * limit,
-      take: limit,
-    });
+    const orderBy = query.orderBy ?? "createdAt";
+    const orderDir = query.orderDir ?? "DESC";
+    const qb = this.runRepo
+      .createQueryBuilder("run")
+      .leftJoinAndSelect("run.scenario", "scenario");
+    if (query.status) qb.where("run.status = :status", { status: query.status });
+    if (orderBy === "scenario.name") {
+      qb.orderBy("scenario.name", orderDir);
+    } else {
+      qb.orderBy(`run.${orderBy}`, orderDir);
+    }
+    qb.skip((page - 1) * limit).take(limit);
+    const [data, total] = await qb.getManyAndCount();
     return { data, total, page, limit } as PaginatedResult<
       ScenarioRunEntity & { scenario: ScenarioEntity }
     >;
diff --git a/server/src/session/session-query.dto.ts b/server/src/session/session-query.dto.ts
new file mode 100644
index 0000000..9b8ef50
--- /dev/null
+++ b/server/src/session/session-query.dto.ts
@@ -0,0 +1,13 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsIn, IsOptional } from "class-validator";
+import { PaginationQueryDto } from "../common/dto/pagination.dto";
+import { SessionOrderBy } from "./session.service";
+
+const SESSION_ORDER_BY: SessionOrderBy[] = ["id", "sessionName", "status", "lastUsedAt", "createdAt", "updatedAt"];
+
+export class SessionQueryDto extends PaginationQueryDto<SessionOrderBy> {
+  @ApiPropertyOptional({ enum: SESSION_ORDER_BY })
+  @IsOptional()
+  @IsIn(SESSION_ORDER_BY)
+  declare orderBy?: SessionOrderBy;
+}
diff --git a/server/src/session/session.controller.ts b/server/src/session/session.controller.ts
index 2ef6e25..b6779ce 100644
--- a/server/src/session/session.controller.ts
+++ b/server/src/session/session.controller.ts
@@ -9,9 +9,9 @@ import {
   Query,
 } from "@nestjs/common";
 import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { PaginationQueryDto } from "../common/dto/pagination.dto";
+import { SessionQueryDto } from "./session-query.dto";
 import { SessionContextService } from "./session-context.service";
-import { SessionOrderBy, SessionService } from "./session.service";
+import { SessionService } from "./session.service";
 
 function maskToken(token: string, head = 6, tail = 4): string {
   if (token.length <= head + tail + 1) return token;
@@ -29,7 +29,7 @@ export class SessionController {
   @Get()
   @ApiOperation({ summary: "List all stored sessions (paginated)" })
   @ApiResponse({ status: 200, description: "Paginated sessions" })
-  findAll(@Query() query: PaginationQueryDto<SessionOrderBy>) {
+  findAll(@Query() query: SessionQueryDto) {
     return this.sessionService.findAll(query);
   }
 
diff --git a/server/src/snippet/dto/snippet-query.dto.ts b/server/src/snippet/dto/snippet-query.dto.ts
new file mode 100644
index 0000000..f5ab25c
--- /dev/null
+++ b/server/src/snippet/dto/snippet-query.dto.ts
@@ -0,0 +1,13 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsIn, IsOptional } from "class-validator";
+import { PaginationQueryDto } from "../../common/dto/pagination.dto";
+import { SnippetOrderBy } from "../snippet.service";
+
+const SNIPPET_ORDER_BY: SnippetOrderBy[] = ["id", "alias", "title"];
+
+export class SnippetQueryDto extends PaginationQueryDto<SnippetOrderBy> {
+  @ApiPropertyOptional({ enum: SNIPPET_ORDER_BY })
+  @IsOptional()
+  @IsIn(SNIPPET_ORDER_BY)
+  declare orderBy?: SnippetOrderBy;
+}
diff --git a/server/src/snippet/snippet.controller.ts b/server/src/snippet/snippet.controller.ts
index dd47e5b..00f489b 100644
--- a/server/src/snippet/snippet.controller.ts
+++ b/server/src/snippet/snippet.controller.ts
@@ -11,11 +11,11 @@ import {
   Query,
 } from "@nestjs/common";
 import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { PaginationQueryDto } from "../common/dto/pagination.dto";
+import { SnippetQueryDto } from "./dto/snippet-query.dto";
 import { CreateSnippetDto } from "./dto/create-snippet.dto";
 import { SnippetExportDto } from "./dto/snippet-export.dto";
 import { UpdateSnippetDto } from "./dto/update-snippet.dto";
-import { SnippetOrderBy, SnippetService } from "./snippet.service";
+import { SnippetService } from "./snippet.service";
 
 @ApiTags("snippets")
 @Controller("snippets")
@@ -40,7 +40,7 @@ export class SnippetController {
   @Get()
   @ApiOperation({ summary: "List all snippets (paginated)" })
   @ApiResponse({ status: 200, description: "Paginated snippets" })
-  findAll(@Query() query: PaginationQueryDto<SnippetOrderBy>) {
+  findAll(@Query() query: SnippetQueryDto) {
     return this.snippetService.findAll(query);
   }