diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd62222..6f3121a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ Versions follow [Semantic Versioning](https://semver.org/).
 
 ---
 
+## Unreleased
+
+### Features
+- **Find in the desktop terminal with ⌘F, or Ctrl+Shift+F on Windows and Linux.** There was no way to search a terminal's output, so finding an error in a long log meant scrolling the scrollback by eye. A find bar now opens over the terminal: every match in the scrollback is highlighted and counted, Enter and Shift+Enter step through them, and Aa and .* switch on matching case and regular expressions. A one-line selection becomes the query. The highlights follow new output while the bar is open, and Esc closes it and hands the keyboard back to the shell. A bare Ctrl+F still reaches the shell as ^F, and find works on a tab whose session has ended, whose last output is what is left to read.
+
 ## 1.1.5 — 2026-10-09
 
 ### Features
diff --git a/README.md b/README.md
index ff4b51b..82d134d 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ You add a server once. After that it sits on the dashboard as a card with live C
 Cards for every host with CPU, RAM and disk bars, uptime, OS version, top processes, and a Docker badge showing how many containers are up. Bars turn yellow, then red, so a sick server is obvious from across the room. Group the grid by tag, sort it, and in the desktop app drag cards into your own order.
 
 ### Real terminals
-Full PTY sessions in tabs. Open as many servers as you need, switch between them from the sidebar, and keep them running while you work in the dashboard.
+Full PTY sessions in tabs. Open as many servers as you need, switch between them from the sidebar, and keep them running while you work in the dashboard. In the desktop app, ⌘F (Ctrl+Shift+F on Windows and Linux) searches a terminal's scrollback and highlights every match.
 
 ### Two panel SFTP
 Local on the left, remote on the right. Tick the files and folders you want and move them across, or just drag them from one side to the other, or straight from your file manager onto the server. Watch the progress bar, select many at once, see when each file was last changed. Nobody remembers `scp -r` syntax anyway.
diff --git a/crates/omnyssh-gui/ui/e2e/terminal.spec.ts b/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
index 40c8517..9d0ab6e 100644
--- a/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
+++ b/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
@@ -420,6 +420,103 @@ test('under a non-Latin layout Ctrl+C still interrupts and Ctrl+Shift+V still pa
   expect(await writes(page)).toEqual([[3], [3]]);
 });
 
+// The find bar searches the scrollback (⌘F on macOS, Ctrl+Shift+F elsewhere). Every
+// key it takes stays out of the shell: the stub records each write, so a stray ^F or a
+// typed query reaching the session would show up there.
+const LOG = 'error one\r\nok\r\nerror two\r\nERROR three\r\n';
+const findBox = (page: Page) => page.getByRole('textbox', { name: 'Find in terminal' });
+const findCount = (page: Page) => page.getByRole('search').locator('[aria-live]');
+
+test('Ctrl+Shift+F finds in the scrollback; Enter steps, Esc hands the keyboard back', async ({
+  page
+}) => {
+  await bootWithClipboard(page);
+  await sendOutput(page, 1, `\r\n${LOG}`);
+  await expect(page.locator('.xterm-rows')).toContainText('ERROR three');
+  await page.locator('.xterm-helper-textarea').focus();
+
+  await page.keyboard.press('Control+Shift+F');
+  await expect(findBox(page)).toBeFocused();
+  await page.keyboard.type('error');
+  // Case-insensitive by default: all three lines match.
+  await expect(findCount(page)).toHaveText(/^\d of 3$/);
+  const first = await findCount(page).textContent();
+  await page.keyboard.press('Enter');
+  await expect(findCount(page)).not.toHaveText(first!);
+  await page.keyboard.press('Shift+Enter');
+  await expect(findCount(page)).toHaveText(first!);
+
+  await page.getByRole('button', { name: 'Match case' }).click();
+  await expect(findCount(page)).toHaveText(/^\d of 2$/);
+  // The toggle leaves the keyboard in the query.
+  await expect(findBox(page)).toBeFocused();
+
+  await page.keyboard.press('Escape');
+  await expect(page.getByRole('search')).toHaveCount(0);
+  await expect(page.locator('.xterm-helper-textarea')).toBeFocused();
+  // The tab is still there, and the shell got none of it.
+  await expect(terminalTab(page)).toBeVisible();
+  expect(await writes(page)).toEqual([]);
+});
+
+test('find reports no results, and an invalid regex, instead of a count', async ({ page }) => {
+  await bootWithClipboard(page);
+  await sendOutput(page, 1, `\r\n${LOG}`);
+  await page.locator('.xterm-helper-textarea').focus();
+  await page.keyboard.press('Control+Shift+F');
+
+  await page.keyboard.type('timeout');
+  await expect(findCount(page)).toHaveText('No results');
+
+  await findBox(page).fill('err(or');
+  await page.getByRole('button', { name: 'Use regular expression' }).click();
+  await expect(findCount(page)).toHaveText('Invalid pattern');
+
+  await findBox(page).fill('^error \\w+');
+  await expect(findCount(page)).toHaveText(/^\d of 3$/);
+});
+
+test('a one-line selection becomes the query', async ({ page }) => {
+  await bootWithClipboard(page);
+  await selectPrompt(page);
+  await page.keyboard.press('Control+Shift+F');
+  await expect(findBox(page)).toHaveValue('omnyssh-ready>');
+  await expect(findCount(page)).toHaveText('1 of 1');
+
+  // Pressing it again with the bar open takes the keyboard back to the query.
+  await page.locator('.xterm-helper-textarea').focus();
+  await page.keyboard.press('Control+Shift+F');
+  await expect(findBox(page)).toBeFocused();
+});
+
+test('bare Ctrl+F stays with the shell', async ({ page }) => {
+  await bootWithClipboard(page);
+  await page.locator('.xterm-helper-textarea').focus();
+  await page.keyboard.press('Control+F');
+  await expect.poll(() => writes(page)).toEqual([[6]]);
+  await expect(page.getByRole('search')).toHaveCount(0);
+});
+
+test('find still works once the session has ended', async ({ page }) => {
+  await bootWithClipboard(page);
+  await sendOutput(page, 1, '\r\nPermission denied, please try again.');
+  await sendOutput(page, 1, END_LINE);
+  await fireExited(page, 1, true);
+  await expect(terminalTab(page).locator('[role="img"]')).toHaveAttribute('aria-label', 'off');
+
+  await page.locator('.xterm-helper-textarea').focus();
+  await page.keyboard.press('Control+Shift+F');
+  await page.keyboard.type('denied');
+  await expect(findCount(page)).toHaveText('1 of 1');
+  // Enter in the bar steps through matches; it does not close the ended tab.
+  await page.keyboard.press('Enter');
+  await expect(terminalTab(page)).toBeVisible();
+
+  await page.keyboard.press('Escape');
+  await page.keyboard.press('Enter');
+  await expect(terminalTab(page)).toHaveCount(0);
+});
+
 test.describe('on macOS', () => {
   test.use({
     userAgent:
@@ -433,4 +530,17 @@ test.describe('on macOS', () => {
     await page.keyboard.press('Control+Shift+C');
     expect(await copied(page)).toEqual([]);
   });
+
+  test('⌘F opens find, and Ctrl+Shift+F is left alone', async ({ page }) => {
+    await bootWithClipboard(page);
+    await page.locator('.xterm-helper-textarea').focus();
+
+    await page.keyboard.press('Control+Shift+F');
+    await expect(page.getByRole('search')).toHaveCount(0);
+
+    await page.keyboard.press('Meta+F');
+    await expect(findBox(page)).toBeFocused();
+    await page.keyboard.type('ready');
+    await expect(findCount(page)).toHaveText('1 of 1');
+  });
 });
diff --git a/crates/omnyssh-gui/ui/package-lock.json b/crates/omnyssh-gui/ui/package-lock.json
index bfd1699..c031ace 100644
--- a/crates/omnyssh-gui/ui/package-lock.json
+++ b/crates/omnyssh-gui/ui/package-lock.json
@@ -10,6 +10,7 @@
         "@tauri-apps/plugin-opener": "^2",
         "@tauri-apps/plugin-store": "^2.4.3",
         "@xterm/addon-fit": "^0.11.0",
+        "@xterm/addon-search": "^0.16.0",
         "@xterm/xterm": "^6.0.0"
       },
       "devDependencies": {
@@ -1413,6 +1414,12 @@
       "integrity": "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==",
       "license": "MIT"
     },
+    "node_modules/@xterm/addon-search": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0.tgz",
+      "integrity": "sha512-9OeuBFu0/uZJPu+9AHKY6g/w0Czyb/Ut0A5t79I4ULoU4IfU5BEpPFVGQxP4zTTMdfZEYkVIRYbHBX1xWwjeSA==",
+      "license": "MIT"
+    },
     "node_modules/@xterm/xterm": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
diff --git a/crates/omnyssh-gui/ui/package.json b/crates/omnyssh-gui/ui/package.json
index e3a4d38..91f05f9 100644
--- a/crates/omnyssh-gui/ui/package.json
+++ b/crates/omnyssh-gui/ui/package.json
@@ -15,6 +15,7 @@
     "@tauri-apps/plugin-opener": "^2",
     "@tauri-apps/plugin-store": "^2.4.3",
     "@xterm/addon-fit": "^0.11.0",
+    "@xterm/addon-search": "^0.16.0",
     "@xterm/xterm": "^6.0.0"
   },
   "devDependencies": {
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/TerminalFind.svelte b/crates/omnyssh-gui/ui/src/lib/screens/TerminalFind.svelte
new file mode 100644
index 0000000..5f8360a
--- /dev/null
+++ b/crates/omnyssh-gui/ui/src/lib/screens/TerminalFind.svelte
@@ -0,0 +1,203 @@
+<script lang="ts">
+  // The find bar over a terminal tab (⌘F / Ctrl+Shift+F). Drives xterm's search addon
+  // over the scrollback: every match is highlighted, the current one more strongly, and
+  // the highlights follow new output while the bar is open. Enter and Shift+Enter step
+  // through matches; Esc closes the bar and hands the keyboard back to the terminal.
+  import { onMount, onDestroy } from 'svelte';
+  import type { ISearchOptions, SearchAddon } from '@xterm/addon-search';
+  import { theme } from '$lib/stores/theme';
+  import { lastError } from '$lib/stores/notifications';
+  import { searchColours } from '$lib/theme/terminalTheme';
+  import Icon from '$lib/theme/Icon.svelte';
+  import { isMac } from '$lib/platform';
+  import { findLabel, type FindResult } from './terminalFind';
+  import { isFindShortcut } from './terminalInput';
+
+  let {
+    search,
+    seed = '',
+    onclose
+  }: { search: SearchAddon; seed?: string; onclose: () => void } = $props();
+
+  let input: HTMLInputElement;
+  let query = $state('');
+  let caseSensitive = $state(false);
+  let regex = $state(false);
+  let result = $state<FindResult>({ kind: 'idle' });
+  let resultsSub: { dispose(): void } | undefined;
+
+  const shortcut = isMac ? '⌘F' : 'Ctrl+Shift+F';
+
+  // The options the highlights were drawn with. The addon records new options before
+  // comparing them with the last ones (addon-search 0.16), so it never notices a
+  // change of case, regex or colours by itself; dropping its cached query makes it
+  // highlight afresh.
+  let drawnWith = '';
+
+  function find(backwards: boolean, incremental = false): void {
+    if (!query) {
+      search.clearDecorations();
+      result = { kind: 'idle' };
+      return;
+    }
+    const key = `${caseSensitive}|${regex}|${$theme}`;
+    if (key !== drawnWith) {
+      search.clearDecorations();
+      drawnWith = key;
+    }
+    const options: ISearchOptions = {
+      caseSensitive,
+      regex,
+      incremental,
+      decorations: searchColours($theme)
+    };
+    try {
+      if (backwards) search.findPrevious(query, options);
+      else search.findNext(query, options);
+    } catch (err) {
+      // Drop the last good query's highlights so they do not pass for this one's.
+      search.clearDecorations();
+      if (regex && err instanceof SyntaxError) {
+        result = { kind: 'invalid' };
+      } else {
+        result = { kind: 'idle' };
+        lastError.set(`Find failed: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    }
+  }
+
+  // Search as the query is typed, and again when an option or the theme (the
+  // highlight colours) changes. Incremental keeps the current match while it still
+  // matches the longer query, rather than jumping to the next one.
+  $effect(() => {
+    void [query, caseSensitive, regex, $theme];
+    find(false, true);
+  });
+
+  /** Take the keyboard, optionally starting from `seed` (a one-line selection). */
+  export function focus(seed?: string): void {
+    if (seed) query = seed;
+    input?.focus();
+    input?.select();
+  }
+
+  function onKeydown(e: KeyboardEvent): void {
+    if (e.isComposing) return;
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      find(e.shiftKey);
+    } else if (e.key === 'Escape') {
+      e.preventDefault();
+      e.stopPropagation();
+      onclose();
+    } else if (isFindShortcut(e, isMac)) {
+      e.preventDefault();
+      input.select();
+    }
+  }
+
+  onMount(() => {
+    resultsSub = search.onDidChangeResults(({ resultIndex, resultCount }) => {
+      result = { kind: 'matches', index: resultIndex, count: resultCount };
+    });
+    focus(seed);
+  });
+
+  onDestroy(() => {
+    resultsSub?.dispose();
+    try {
+      search.clearDecorations();
+    } catch {
+      // The terminal, and the addon with it, may already be disposed.
+    }
+  });
+
+  // Buttons keep the keyboard in the query, so Enter goes on stepping after a click.
+  const keepFocus = (e: MouseEvent) => e.preventDefault();
+  const iconButton =
+    'flex h-7 w-7 items-center justify-center rounded-md text-muted transition hover:bg-surface-inset ' +
+    'hover:text-fg focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-focus ' +
+    'disabled:cursor-not-allowed disabled:opacity-40';
+  const toggleOn = 'bg-surface-inset text-fg';
+  let noMatches = $derived(
+    result.kind === 'invalid' || (result.kind === 'matches' && result.count === 0)
+  );
+  let canStep = $derived(result.kind === 'matches' && result.count > 0);
+</script>
+
+<div
+  role="search"
+  class="absolute right-4 z-10 flex items-center gap-1 rounded-xl border border-default bg-surface-raised py-1 pl-3 pr-1 shadow-soft"
+  style="top: max(var(--titlebar-h), 0.5rem);"
+>
+  <span class="flex text-muted"><Icon name="search" size={14} /></span>
+  <input
+    bind:this={input}
+    bind:value={query}
+    onkeydown={onKeydown}
+    type="text"
+    placeholder="Find"
+    title="Find in terminal ({shortcut})"
+    aria-label="Find in terminal"
+    autocomplete="off"
+    autocapitalize="off"
+    spellcheck="false"
+    class="w-44 bg-transparent px-1 py-1 text-sm text-fg outline-none placeholder:text-faint"
+  />
+  <span
+    class="min-w-[5.5rem] whitespace-nowrap pr-1 text-right text-xs tabular-nums {noMatches
+      ? 'text-status-crit'
+      : 'text-muted'}"
+    aria-live="polite">{findLabel(result)}</span
+  >
+  <button
+    type="button"
+    class="{iconButton} font-mono text-xs {caseSensitive ? toggleOn : ''}"
+    title="Match case"
+    aria-label="Match case"
+    aria-pressed={caseSensitive}
+    onmousedown={keepFocus}
+    onclick={() => (caseSensitive = !caseSensitive)}>Aa</button
+  >
+  <button
+    type="button"
+    class="{iconButton} font-mono text-xs {regex ? toggleOn : ''}"
+    title="Use regular expression"
+    aria-label="Use regular expression"
+    aria-pressed={regex}
+    onmousedown={keepFocus}
+    onclick={() => (regex = !regex)}>.*</button
+  >
+  <button
+    type="button"
+    class={iconButton}
+    title="Previous match (Shift+Enter)"
+    aria-label="Previous match"
+    disabled={!canStep}
+    onmousedown={keepFocus}
+    onclick={() => find(true)}
+  >
+    <span class="flex rotate-180"><Icon name="chevron" size={14} /></span>
+  </button>
+  <button
+    type="button"
+    class={iconButton}
+    title="Next match (Enter)"
+    aria-label="Next match"
+    disabled={!canStep}
+    onmousedown={keepFocus}
+    onclick={() => find(false)}
+  >
+    <Icon name="chevron" size={14} />
+  </button>
+  <button
+    type="button"
+    class={iconButton}
+    title="Close (Esc)"
+    aria-label="Close find"
+    onmousedown={keepFocus}
+    onclick={onclose}
+  >
+    <Icon name="close" size={14} />
+  </button>
+</div>
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte b/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte
index 91a5923..93809da 100644
--- a/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte
+++ b/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte
@@ -9,6 +9,7 @@
   import { get } from 'svelte/store';
   import type { Terminal } from '@xterm/xterm';
   import type { FitAddon } from '@xterm/addon-fit';
+  import type { SearchAddon } from '@xterm/addon-search';
   import { Channel } from '@tauri-apps/api/core';
   import { theme } from '$lib/stores/theme';
   import { xtermTheme } from '$lib/theme/terminalTheme';
@@ -28,7 +29,15 @@
     terminalPaste
   } from '$lib/ipc/commands';
   import { shouldFadeTop } from './terminalFade';
-  import { chunkBytes, closesEndedTab, isCopyShortcut, layoutFallback } from './terminalInput';
+  import {
+    chunkBytes,
+    closesEndedTab,
+    isCopyShortcut,
+    isFindShortcut,
+    layoutFallback
+  } from './terminalInput';
+  import { HIGHLIGHT_LIMIT, seedQuery } from './terminalFind';
+  import TerminalFind from './TerminalFind.svelte';
   import { isMac } from '$lib/platform';
   import type { TerminalBytes } from '$lib/bindings';
 
@@ -85,6 +94,10 @@
   let container: HTMLDivElement;
   let term: Terminal | undefined;
   let fitAddon: FitAddon | undefined;
+  let searchAddon = $state<SearchAddon | undefined>();
+  let findOpen = $state(false);
+  let findSeed = $state('');
+  let findBar: TerminalFind | undefined = $state();
   let termId: number | undefined;
   let destroyed = false;
   let connected = false;
@@ -114,6 +127,23 @@
     if (termId != null && !ended()) void terminalResize(termId, term.cols, term.rows).catch(() => {});
   }
 
+  /** Open the find bar, or take it back to the query if it is already open. A one-line
+   *  selection becomes the query, as in most editors. */
+  function openFind(): void {
+    const seed = seedQuery(term?.getSelection() ?? '');
+    if (findOpen) {
+      findBar?.focus(seed);
+    } else {
+      findSeed = seed;
+      findOpen = true;
+    }
+  }
+
+  function closeFind(): void {
+    findOpen = false;
+    if (keyboardFree()) term?.focus();
+  }
+
   function scheduleFit(): void {
     if (fitScheduled) return;
     fitScheduled = true;
@@ -125,9 +155,10 @@
 
   onMount(() => {
     void (async () => {
-      const [{ Terminal }, { FitAddon }] = await Promise.all([
+      const [{ Terminal }, { FitAddon }, { SearchAddon }] = await Promise.all([
         import('@xterm/xterm'),
-        import('@xterm/addon-fit')
+        import('@xterm/addon-fit'),
+        import('@xterm/addon-search')
       ]);
       if (destroyed) return;
 
@@ -135,10 +166,16 @@
         fontFamily: MONO,
         fontSize: 13,
         cursorBlink: true,
-        scrollback: 5000
+        scrollback: 5000,
+        // The search addon highlights matches through registerDecoration, which xterm
+        // still gates as proposed API.
+        allowProposedApi: true
       });
       fitAddon = new FitAddon();
       term.loadAddon(fitAddon);
+      const search = new SearchAddon({ highlightLimit: HIGHLIGHT_LIMIT });
+      term.loadAddon(search);
+      searchAddon = search;
       term.open(container);
       term.onScroll(syncScrolled);
 
@@ -187,6 +224,12 @@
         // The streamer chord belongs to the window (AppShell), never to the shell, where
         // a ^S would stop its output.
         if (isStreamerChord(e)) return false;
+        // Find works on an ended session too: its last output is what is left to read.
+        if (isFindShortcut(e, isMac)) {
+          e.preventDefault();
+          openFind();
+          return false;
+        }
         if (isCopyShortcut(e, isMac)) {
           e.preventDefault();
           if (term?.hasSelection()) {
@@ -263,7 +306,11 @@
       void [$dialogs, $palette, $activeEntity];
       requestAnimationFrame(() => {
         safeFit();
-        if (keyboardFree()) term?.focus();
+        // An open find bar keeps the keyboard it had when the tab was left.
+        if (keyboardFree()) {
+          if (findOpen) findBar?.focus();
+          else term?.focus();
+        }
         syncScrolled();
       });
     }
@@ -280,6 +327,9 @@
   <div class="h-full w-full" style="padding: max(var(--titlebar-h), 0.75rem) 0.5rem 1rem;">
     <div bind:this={container} class="h-full w-full" class:term-fade={scrolled}></div>
   </div>
+  {#if findOpen && searchAddon}
+    <TerminalFind bind:this={findBar} search={searchAddon} seed={findSeed} onclose={closeFind} />
+  {/if}
 </div>
 
 <style>
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/terminalFind.test.ts b/crates/omnyssh-gui/ui/src/lib/screens/terminalFind.test.ts
new file mode 100644
index 0000000..ca227a5
--- /dev/null
+++ b/crates/omnyssh-gui/ui/src/lib/screens/terminalFind.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it } from 'vitest';
+import { findLabel, HIGHLIGHT_LIMIT, seedQuery } from './terminalFind';
+
+describe('findLabel — the find bar count', () => {
+  it('says nothing before a query is typed', () => {
+    expect(findLabel({ kind: 'idle' })).toBe('');
+  });
+
+  it('says so when the regex does not compile', () => {
+    expect(findLabel({ kind: 'invalid' })).toBe('Invalid pattern');
+  });
+
+  it('says when nothing matches', () => {
+    expect(findLabel({ kind: 'matches', index: -1, count: 0 })).toBe('No results');
+  });
+
+  it('counts from one', () => {
+    expect(findLabel({ kind: 'matches', index: 0, count: 3 })).toBe('1 of 3');
+    expect(findLabel({ kind: 'matches', index: 2, count: 3 })).toBe('3 of 3');
+  });
+
+  it('marks a count that reached the highlight limit as a lower bound', () => {
+    expect(findLabel({ kind: 'matches', index: 4, count: HIGHLIGHT_LIMIT })).toBe(
+      `5 of ${HIGHLIGHT_LIMIT}+`
+    );
+    expect(findLabel({ kind: 'matches', index: -1, count: HIGHLIGHT_LIMIT })).toBe(
+      `${HIGHLIGHT_LIMIT}+ matches`
+    );
+  });
+});
+
+describe('seedQuery — a selection pre-fills the find bar', () => {
+  it('takes a one-line selection as is', () => {
+    expect(seedQuery('error: connection refused')).toBe('error: connection refused');
+  });
+
+  it('ignores a selection across lines', () => {
+    expect(seedQuery('first\nsecond')).toBe('');
+    expect(seedQuery('first\r\nsecond')).toBe('');
+  });
+});
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/terminalFind.ts b/crates/omnyssh-gui/ui/src/lib/screens/terminalFind.ts
new file mode 100644
index 0000000..b0ca771
--- /dev/null
+++ b/crates/omnyssh-gui/ui/src/lib/screens/terminalFind.ts
@@ -0,0 +1,28 @@
+// The terminal's find bar (TerminalFind.svelte) drives xterm's search addon; what it
+// reads back is a match index and count, turned into the bar's label here so the
+// wording can be tested without a terminal.
+
+/** Matches the addon highlights before it stops counting; past it the count is "N+". */
+export const HIGHLIGHT_LIMIT = 1000;
+
+export type FindResult =
+  | { kind: 'idle' }
+  | { kind: 'invalid' }
+  | { kind: 'matches'; index: number; count: number };
+
+/** The label beside the query: empty until something is typed. The addon reports
+ *  index -1 when no match is selected, which happens once the count hits the limit. */
+export function findLabel(result: FindResult): string {
+  if (result.kind === 'idle') return '';
+  if (result.kind === 'invalid') return 'Invalid pattern';
+  const { index, count } = result;
+  if (count === 0) return 'No results';
+  const total = count >= HIGHLIGHT_LIMIT ? `${HIGHLIGHT_LIMIT}+` : String(count);
+  return index < 0 ? `${total} matches` : `${index + 1} of ${total}`;
+}
+
+/** What the bar starts with when it opens over a selection: the selected text, if it
+ *  is on one line. A multi-line selection would never match a single line. */
+export function seedQuery(selection: string): string {
+  return selection.includes('\n') || selection.includes('\r') ? '' : selection;
+}
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.test.ts b/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.test.ts
index 461925f..8b2495f 100644
--- a/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.test.ts
+++ b/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.test.ts
@@ -4,6 +4,7 @@ import {
   closesEndedTab,
   INPUT_CHUNK,
   isCopyShortcut,
+  isFindShortcut,
   layoutFallback,
   type KeyPress
 } from './terminalInput';
@@ -63,6 +64,44 @@ describe('isCopyShortcut — Ctrl+Shift+C copies on Windows and Linux', () => {
   });
 });
 
+describe('isFindShortcut — ⌘F on macOS, Ctrl+Shift+F elsewhere opens find', () => {
+  const find = (over: Partial<KeyPress>) => press({ key: 'f', code: 'KeyF', keyCode: 70, ...over });
+  const cmdF = (over: Partial<KeyPress> = {}) =>
+    find({ ctrlKey: false, shiftKey: false, metaKey: true, ...over });
+
+  it('opens on ⌘F on macOS, whichever case the key reports', () => {
+    expect(isFindShortcut(cmdF(), true)).toBe(true);
+    expect(isFindShortcut(cmdF({ key: 'F' }), true)).toBe(true);
+  });
+
+  it('opens on Ctrl+Shift+F on Windows and Linux', () => {
+    expect(isFindShortcut(find({ key: 'F' }), false)).toBe(true);
+  });
+
+  it('leaves a bare Ctrl+F to the shell', () => {
+    expect(isFindShortcut(find({ shiftKey: false }), false)).toBe(false);
+    expect(isFindShortcut(find({ shiftKey: false }), true)).toBe(false);
+  });
+
+  it('takes only its own platform chord', () => {
+    expect(isFindShortcut(cmdF(), false)).toBe(false);
+    expect(isFindShortcut(find({}), true)).toBe(false);
+    expect(isFindShortcut(cmdF({ shiftKey: true }), true)).toBe(false);
+    expect(isFindShortcut(find({ altKey: true }), false)).toBe(false);
+  });
+
+  it('follows the physical key only under a non-Latin layout', () => {
+    expect(isFindShortcut(find({ key: '\u0410', keyCode: 0 }), false)).toBe(true);
+    expect(isFindShortcut(find({ key: 'U', code: 'KeyF' }), false)).toBe(false);
+  });
+
+  it('never fires on keyup or mid-composition', () => {
+    expect(isFindShortcut(cmdF({ type: 'keyup' }), true)).toBe(false);
+    expect(isFindShortcut(cmdF({ isComposing: true }), true)).toBe(false);
+    expect(isFindShortcut(find({ keyCode: 229 }), false)).toBe(false);
+  });
+});
+
 describe('closesEndedTab — Enter or Esc dismisses a tab whose session ended', () => {
   const key = (k: string, over: Partial<KeyPress> = {}): KeyPress =>
     press({ key: k, code: k, keyCode: 13, ctrlKey: false, shiftKey: false, ...over });
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.ts b/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.ts
index 23acb4c..650eeaf 100644
--- a/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.ts
+++ b/crates/omnyssh-gui/ui/src/lib/screens/terminalInput.ts
@@ -42,6 +42,17 @@ export function isCopyShortcut(e: KeyPress, mac: boolean): boolean {
   return e.key === 'c' || e.key === 'C' || (e.code === 'KeyC' && nonLatinLetter(e.key));
 }
 
+/** ⌘F on macOS; Ctrl+Shift+F on Windows and Linux, as in GNOME Terminal and Windows
+ *  Terminal, because a bare Ctrl+F has to stay ^F (readline's forward-char, less's
+ *  page down). Opens the terminal's find bar. */
+export function isFindShortcut(e: KeyPress, mac: boolean): boolean {
+  if (e.type !== 'keydown' || e.isComposing || e.keyCode === 229 || e.altKey) return false;
+  if (mac ? !e.metaKey || e.ctrlKey || e.shiftKey : e.metaKey || !e.ctrlKey || !e.shiftKey) {
+    return false;
+  }
+  return e.key === 'f' || e.key === 'F' || (e.code === 'KeyF' && nonLatinLetter(e.key));
+}
+
 /** Enter or Esc, unmodified and outside an IME composition: what closes a tab whose
  *  session has ended. */
 export function closesEndedTab(e: KeyPress): boolean {
diff --git a/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.test.ts b/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.test.ts
index b221d42..d62d07a 100644
--- a/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.test.ts
+++ b/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { xtermTheme } from './terminalTheme';
+import { searchColours, xtermTheme } from './terminalTheme';
 
 // The xterm theme is derived from the brandbook tokens and pushed to every live
 // terminal on toggle (tech-gui.md §5.1). Light and dark must differ on the surfaces
@@ -29,3 +29,18 @@ describe('xtermTheme', () => {
     }
   });
 });
+
+describe('searchColours', () => {
+  it('gives the search addon #RRGGBB backgrounds, which is all it accepts', () => {
+    for (const t of ['light', 'dark'] as const) {
+      const c = searchColours(t);
+      expect(c.matchBackground).toMatch(/^#[0-9a-f]{6}$/i);
+      expect(c.activeMatchBackground).toMatch(/^#[0-9a-f]{6}$/i);
+      expect(c.activeMatchBackground).not.toBe(c.matchBackground);
+    }
+  });
+
+  it('differs between themes, so a toggle re-paints the highlights', () => {
+    expect(searchColours('dark').matchBackground).not.toBe(searchColours('light').matchBackground);
+  });
+});
diff --git a/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.ts b/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.ts
index 0805531..9efc401 100644
--- a/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.ts
+++ b/crates/omnyssh-gui/ui/src/lib/theme/terminalTheme.ts
@@ -62,3 +62,35 @@ const THEMES: Record<Theme, ITheme> = { dark, light };
 export function xtermTheme(theme: Theme): ITheme {
   return THEMES[theme];
 }
+
+/** Find-bar match highlights: the --status-warn yellow, muted for every match and full
+ *  for the current one, so a match never reads as a selection. The search addon takes
+ *  backgrounds only as #RRGGBB; the foreground keeps its own colour on top of them. */
+export interface SearchColours {
+  matchBackground: string;
+  matchOverviewRuler: string;
+  activeMatchBackground: string;
+  activeMatchBorder: string;
+  activeMatchColorOverviewRuler: string;
+}
+
+const SEARCH: Record<Theme, SearchColours> = {
+  dark: {
+    matchBackground: '#5a4a1e',
+    matchOverviewRuler: '#e8c15a',
+    activeMatchBackground: '#94701c',
+    activeMatchBorder: '#f0d178',
+    activeMatchColorOverviewRuler: '#f0d178'
+  },
+  light: {
+    matchBackground: '#fbe7a8',
+    matchOverviewRuler: '#b7791f',
+    activeMatchBackground: '#f2b84b',
+    activeMatchBorder: '#b7791f',
+    activeMatchColorOverviewRuler: '#b7791f'
+  }
+};
+
+export function searchColours(theme: Theme): SearchColours {
+  return SEARCH[theme];
+}