@@ -85,6 +85,7 @@ import { SwipeableScrollGateProvider, useSwipeableScrollGate } from "./thread-sw
 import { useFabScroll } from "./FabScrollContext";
 import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
 import { ThreadListFilters } from "./ThreadListFilters";
+import { useRestoreOffsetAfterSearch } from "./useRestoreOffsetAfterSearch";
 
 interface HomeScreenProps {
   readonly projects: ReadonlyArray<EnvironmentProject>;
@@ -316,19 +317,12 @@ export function HomeScreen(props: HomeScreenProps) {
   const listRef = useRef<LegendListRef>(null);
   const searchMode = workspace?.state.tabs.threads.searchMode;
   const restoredOffset = workspace?.state.tabs.threads.scrollOffset;
-  // Only a return from search restores. On mount, UIKit already rests the list
-  // below the header, and a scroll here would use an unmeasured header inset.
-  const previousSearchMode = useRef(searchMode);
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- restores the thread list's saved scroll offset through the list ref when search goes back to resting
-  useEffect(() => {
-    const restoringSearch = previousSearchMode.current !== "resting" && searchMode === "resting";
-    previousSearchMode.current = searchMode;
-    if (!restoringSearch || restoredOffset === undefined) return;
+  useRestoreOffsetAfterSearch(searchMode, restoredOffset, (offset) =>
     listRef.current?.scrollToOffset({
-      offset: restoredOffset - (Platform.OS === "ios" ? insets.top : 0),
+      offset: offset - (Platform.OS === "ios" ? insets.top : 0),
       animated: false,
-    });
-  }, [searchMode, insets.top, restoredOffset]);
+    }),
+  );
   const swipeRowActivation = createSwipeRowActivation();
   const activateVisibleRows = (rows: ReadonlyArray<ThreadListV2ListItem>) => {
     const state = listRef.current?.getState();
 
@@ -0,0 +1,53 @@
+import { act } from "react";
+import { createRoot } from "react-dom/client";
+import { expect, it, vi } from "vite-plus/test";
+
+import type { WorkspaceSearchMode } from "../workspace/workspace-tabs-state";
+import { useRestoreOffsetAfterSearch } from "./useRestoreOffsetAfterSearch";
+
+type Props = { mode: WorkspaceSearchMode; offset: number | undefined };
+
+function mountProbe() {
+  const restore = vi.fn();
+  function Probe(props: Props) {
+    useRestoreOffsetAfterSearch(props.mode, props.offset, restore);
+    return null;
+  }
+  const root = createRoot(document.createElement("div"));
+  return {
+    restore,
+    render: (props: Props) => act(async () => root.render(<Probe {...props} />)),
+    [Symbol.dispose]: () => act(() => root.unmount()),
+  };
+}
+
+it("leaves the list where UIKit rested it when Home mounts at rest", async () => {
+  using screen = mountProbe();
+  await screen.render({ mode: "resting", offset: 0 });
+  await screen.render({ mode: "resting", offset: 0 });
+  expect(screen.restore).not.toHaveBeenCalled();
+});
+
+it("restores the saved offset when active or expanded search returns to resting", async () => {
+  using screen = mountProbe();
+  await screen.render({ mode: "resting", offset: 120 });
+  await screen.render({ mode: "active", offset: 120 });
+  await screen.render({ mode: "expanded", offset: 120 });
+  expect(screen.restore).not.toHaveBeenCalled();
+
+  await screen.render({ mode: "resting", offset: 80 });
+  expect(screen.restore).toHaveBeenCalledExactlyOnceWith(80);
+
+  await screen.render({ mode: "active", offset: 80 });
+  await screen.render({ mode: "resting", offset: 200 });
+  expect(screen.restore).toHaveBeenCalledTimes(2);
+  expect(screen.restore).toHaveBeenLastCalledWith(200);
+});
+
+it("does not scroll again when the saved offset changes while resting", async () => {
+  using screen = mountProbe();
+  await screen.render({ mode: "active", offset: 50 });
+  await screen.render({ mode: "resting", offset: 50 });
+  await screen.render({ mode: "resting", offset: 300 });
+  expect(screen.restore).toHaveBeenCalledExactlyOnceWith(50);
+});
@@ -0,0 +1,22 @@
+import { useEffect, useRef } from "react";
+
+import type { WorkspaceSearchMode } from "../workspace/workspace-tabs-state";
+
+/**
+ * Restores a list's saved offset when search returns to resting. Mounting at rest restores
+ * nothing: UIKit already rests the list below the header, and a scroll there would use an
+ * unmeasured header inset.
+ */
+export function useRestoreOffsetAfterSearch(
+  searchMode: WorkspaceSearchMode | undefined,
+  savedOffset: number | undefined,
+  restore: (offset: number) => void,
+) {
+  const previousSearchMode = useRef(searchMode);
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- scrolls the list to the offset saved when search opened once the tab returns to resting
+  useEffect(() => {
+    const restoringSearch = previousSearchMode.current !== "resting" && searchMode === "resting";
+    previousSearchMode.current = searchMode;
+    if (restoringSearch && savedOffset !== undefined) restore(savedOffset);
+  }, [searchMode, savedOffset, restore]);
+}
@@ -31,6 +31,7 @@ const reactTests = [
   "src/features/terminal/useTerminalExitNavigation.test.tsx",
   "src/features/threads/use-thread-list-now.test.tsx",
   "src/features/home/home-list-options.test.tsx",
+  "src/features/home/useRestoreOffsetAfterSearch.test.tsx",
   "src/features/connection/ConnectionsNewRouteScreen.test.tsx",
 ];