diff --git a/apps/web/src/components/sidebar/SidebarUpdatePill.browser.test.tsx b/apps/web/src/components/sidebar/SidebarUpdatePill.browser.test.tsx
index 0f751bc52aef6..d908ee2b385a5 100644
--- a/apps/web/src/components/sidebar/SidebarUpdatePill.browser.test.tsx
+++ b/apps/web/src/components/sidebar/SidebarUpdatePill.browser.test.tsx
@@ -11,8 +11,15 @@ const mocks = vi.hoisted(() => {
   const listeners = new Set<() => void>();
   return {
     update: null as DesktopUpdateState | null,
-    hasUpdates: false,
-    rows: [] as ReadonlyArray<UpdateEverythingRow>,
+    isElectron: true,
+    everything: {
+      hasUpdates: false,
+      summary: "Update everything",
+      version: null,
+      providerCount: 0,
+      rows: [] as ReadonlyArray<UpdateEverythingRow>,
+      restarts: [],
+    },
     subscribe: (listener: () => void) => {
       listeners.add(listener);
       return () => listeners.delete(listener);
@@ -30,20 +37,18 @@ vi.mock("../../state/desktopUpdate", async (importOriginal) => ({
     () => mocks.update,
   ),
 }));
-// The pill only renders in the desktop app.
 vi.mock("../../env", async (importOriginal) => ({
   ...(await importOriginal<typeof import("../../env")>()),
-  isElectron: true,
+  get isElectron() {
+    return mocks.isElectron;
+  },
 }));
-vi.mock("./useUpdateEverything", () => ({
-  useUpdateEverything: () => ({
-    hasUpdates: mocks.hasUpdates,
-    summary: "Update everything",
-    version: null,
-    providerCount: 0,
-    rows: mocks.rows,
-    restarts: [],
-  }),
+vi.mock("./useUpdateEverything", async () => ({
+  useUpdateEverything: (await import("react")).useSyncExternalStore.bind(
+    null,
+    mocks.subscribe,
+    () => mocks.everything,
+  ),
 }));
 
 function nightlyUpdate(releaseNotes: DesktopUpdateState["releaseNotes"]): DesktopUpdateState {
@@ -76,11 +81,12 @@ function setup(
   {
     hasUpdates = false,
     rows = [],
-  }: { hasUpdates?: boolean; rows?: ReadonlyArray<UpdateEverythingRow> } = {},
+    isElectron = true,
+  }: { hasUpdates?: boolean; rows?: ReadonlyArray<UpdateEverythingRow>; isElectron?: boolean } = {},
 ) {
   mocks.update = update;
-  mocks.hasUpdates = hasUpdates;
-  mocks.rows = rows;
+  mocks.isElectron = isElectron;
+  mocks.everything = { ...mocks.everything, hasUpdates, rows };
 }
 
 function publish(update: DesktopUpdateState | null) {
@@ -90,6 +96,14 @@ function publish(update: DesktopUpdateState | null) {
   });
 }
 
+const LAPTOP_CODEX: UpdateEverythingRow = {
+  environmentId: null,
+  label: "Laptop",
+  app: null,
+  skipped: null,
+  providers: ["Codex"],
+};
+
 const releaseNotes = () => document.querySelector('[aria-label="Update release notes"]');
 
 describe("SidebarUpdatePill release notes", () => {
@@ -127,7 +141,7 @@ describe("SidebarUpdatePill release notes", () => {
 
 describe("SidebarUpdatePill update everything", () => {
   it("does not refocus the update button after a pointer cancel", async () => {
-    setup(null, { hasUpdates: true });
+    setup(null, { hasUpdates: true, rows: [LAPTOP_CODEX] });
     await using screen = await render(<SidebarUpdatePill />);
     const button = screen.getByRole("button", { name: "Update everything" });
     await userEvent.click(button);
@@ -140,7 +154,7 @@ describe("SidebarUpdatePill update everything", () => {
   });
 
   it("returns focus to the update button after Escape", async () => {
-    setup(null, { hasUpdates: true });
+    setup(null, { hasUpdates: true, rows: [LAPTOP_CODEX] });
     await using screen = await render(<SidebarUpdatePill />);
     const button = screen.getByRole("button", { name: "Update everything" });
     await userEvent.click(button);
@@ -167,4 +181,23 @@ describe("SidebarUpdatePill update everything", () => {
     await expect.element(row.getByRole("cell", { name: label, exact: true })).toBeVisible();
     await expect.element(row.getByRole("cell", { name: "Claude", exact: true })).toBeVisible();
   });
+
+  it("keeps an open dialog on web when the updates finish and the pill hides", async () => {
+    setup(null, { hasUpdates: true, rows: [LAPTOP_CODEX], isElectron: false });
+    await using screen = await render(<SidebarUpdatePill />);
+    await userEvent.click(screen.getByRole("button", { name: "Update everything" }));
+    await expect.element(page.getByRole("button", { name: "Update", exact: true })).toBeVisible();
+
+    await act(() => {
+      mocks.everything = { ...mocks.everything, hasUpdates: false, rows: [] };
+      mocks.notify();
+    });
+    await expect
+      .element(screen.getByRole("button", { name: "Update everything" }))
+      .not.toBeInTheDocument();
+    const dialog = page.getByRole("alertdialog");
+    await expect.element(dialog.getByText("Everything is up to date")).toBeVisible();
+    await userEvent.click(dialog.getByRole("button", { name: "Close" }));
+    await vi.waitFor(() => expect(document.querySelector('[role="alertdialog"]')).toBeNull());
+  });
 });
diff --git a/apps/web/src/components/sidebar/SidebarUpdatePill.tsx b/apps/web/src/components/sidebar/SidebarUpdatePill.tsx
index 5df8007ef4677..6e024265e2e27 100644
--- a/apps/web/src/components/sidebar/SidebarUpdatePill.tsx
+++ b/apps/web/src/components/sidebar/SidebarUpdatePill.tsx
@@ -4,7 +4,7 @@ import {
   managedUpdatesDenial,
 } from "@t3tools/contracts";
 import { TriangleAlertIcon } from "lucide-react";
-import { type ComponentProps, useId, useRef, useState } from "react";
+import { type ComponentProps, type ReactNode, useId, useRef, useState } from "react";
 import { flushSync } from "react-dom";
 import { settlePromise, squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 import { isElectron } from "../../env";
@@ -401,8 +401,6 @@ function SidebarUpdateControl() {
     );
   };
 
-  if (!isElectron && !runsEverything && !isRunningEverything) return null;
-
   const statusIcon = (
     <DesktopUpdateStatusIcon
       key={showCheckIcon ? checkAnimationKey : iconStatus}
@@ -424,6 +422,14 @@ function SidebarUpdateControl() {
       onConfirm={() => void runEverything()}
     />
   );
+  // Every path renders the same [pill, dialog] shape, so an open dialog outlives a hidden pill.
+  const withDialog = (pill: ReactNode) => (
+    <>
+      {pill}
+      {confirmDialog}
+    </>
+  );
+  if (!isElectron && !runsEverything && !isRunningEverything) return withDialog(null);
 
   if (run !== null) {
     const local: UpdateRunLocalState =
@@ -432,7 +438,7 @@ function SidebarUpdateControl() {
         : state?.status === "downloading"
           ? { status: "downloading", percent: state.downloadPercent }
           : { status: "waiting" };
-    return (
+    return withDialog(
       <SidebarMenuItem className="ml-auto flex flex-1">
         <SidebarUpdateCapsule
           run={run}
@@ -455,8 +461,7 @@ function SidebarUpdateControl() {
               }
             : {})}
         />
-        {confirmDialog}
-      </SidebarMenuItem>
+      </SidebarMenuItem>,
     );
   }
 
@@ -507,7 +512,7 @@ function SidebarUpdateControl() {
     </button>
   );
 
-  return (
+  return withDialog(
     <SidebarMenuItem className="ml-auto shrink-0">
       <Popover
         handle={releaseNotesPopoverHandle}
@@ -584,7 +589,6 @@ function SidebarUpdateControl() {
           </PopoverPopup>
         ) : null}
       </Popover>
-      {confirmDialog}
-    </SidebarMenuItem>
+    </SidebarMenuItem>,
   );
 }
diff --git a/apps/web/src/components/sidebar/UpdateEverythingDialog.tsx b/apps/web/src/components/sidebar/UpdateEverythingDialog.tsx
index 586438bb4420e..be61cad85c191 100644
--- a/apps/web/src/components/sidebar/UpdateEverythingDialog.tsx
+++ b/apps/web/src/components/sidebar/UpdateEverythingDialog.tsx
@@ -127,26 +127,43 @@ function UpdateEverythingDialogContent({
   const restarting = new Set(restarts.map((machine) => machine.environmentId));
   const updating = rows.filter((row) => row.app !== null || row.providers.length > 0);
   const skipped = rows.filter((row) => row.skipped !== null);
+  // Updates can finish elsewhere while this is open. A track switch with no rows still saves the track.
+  const empty = title === undefined && updating.length === 0;
 
   return (
     <>
       <AlertDialogHeader className="shrink-0">
         <AlertDialogTitle>
-          {title ?? `Update ${updating.length} ${updating.length === 1 ? "machine" : "machines"}?`}
+          {empty
+            ? checking
+              ? "Checking for updates…"
+              : skipped.length > 0
+                ? "Nothing to update right now"
+                : "Everything is up to date"
+            : (title ??
+              `Update ${updating.length} ${updating.length === 1 ? "machine" : "machines"}?`)}
         </AlertDialogTitle>
         <AlertDialogDescription>
-          {version !== null ? (
+          {empty ? (
+            checking || skipped.length > 0 ? null : (
+              "Nothing is left to update."
+            )
+          ) : (
             <>
-              T3 Code <span className="font-mono text-xs">{version}</span>
+              {version !== null ? (
+                <>
+                  T3 Code <span className="font-mono text-xs">{version}</span>
+                </>
+              ) : null}
+              {version !== null && providerCount > 0 ? " · " : null}
+              {providerCount > 0
+                ? `${providerCount} provider ${providerCount === 1 ? "update" : "updates"}`
+                : null}
+              {checking
+                ? `${version !== null || providerCount > 0 ? " · " : ""}Checking for more…`
+                : null}
             </>
-          ) : null}
-          {version !== null && providerCount > 0 ? " · " : null}
-          {providerCount > 0
-            ? `${providerCount} provider ${providerCount === 1 ? "update" : "updates"}`
-            : null}
-          {checking
-            ? `${version !== null || providerCount > 0 ? " · " : ""}Checking for more…`
-            : null}
+          )}
         </AlertDialogDescription>
       </AlertDialogHeader>
       <ScrollArea scrollFade>
@@ -156,55 +173,57 @@ function UpdateEverythingDialogContent({
               {note}
             </p>
           ))}
-          {/* Machine names truncate first. Provider lists wrap between names, never inside one. */}
-          <div
-            role="table"
-            className="grid grid-cols-[minmax(4rem,max-content)_max-content_minmax(min-content,1fr)_max-content] gap-x-4 text-sm"
-          >
+          {empty ? null : (
+            // Machine names truncate first. Provider lists wrap between names, never inside one.
             <div
-              role="row"
-              className="col-span-full grid grid-cols-subgrid border-b pb-1.5 text-muted-foreground text-xs"
+              role="table"
+              className="grid grid-cols-[minmax(4rem,max-content)_max-content_minmax(min-content,1fr)_max-content] gap-x-4 text-sm"
             >
-              <span role="columnheader">Machine</span>
-              <span role="columnheader">T3 Code</span>
-              <span role="columnheader">Providers</span>
-              <span role="columnheader" />
-            </div>
-            {updating.map((row) => (
               <div
-                key={row.environmentId ?? "this-app"}
                 role="row"
-                className="col-span-full grid grid-cols-subgrid border-b border-border/50 py-1.5 last:border-b-0"
+                className="col-span-full grid grid-cols-subgrid border-b pb-1.5 text-muted-foreground text-xs"
               >
-                <span role="cell" className="max-w-32 min-w-0">
-                  <span className="sr-only">{row.label}</span>
-                  <MiddleTruncate value={row.label} aria-hidden />
-                </span>
-                <span role="cell">
-                  {row.app !== null ? APP_LABELS[row.app] : null}
-                  {row.app === null && row.skipped !== null ? (
-                    <span className="text-muted-foreground">Skipped</span>
-                  ) : null}
-                  {row.app === "this-app" ? (
-                    <span className="block text-muted-foreground text-xs">restarts last</span>
-                  ) : null}
-                </span>
-                <span role="cell">
-                  {row.providers.map((provider, index) => (
-                    <Fragment key={provider}>
-                      <span className="whitespace-nowrap">{provider}</span>
-                      {index < row.providers.length - 1 ? ", " : null}
-                    </Fragment>
-                  ))}
-                </span>
-                <span role="cell" className="text-right">
-                  {row.environmentId !== null && restarting.has(row.environmentId) ? (
-                    <RunningThreads environmentId={row.environmentId} />
-                  ) : null}
-                </span>
+                <span role="columnheader">Machine</span>
+                <span role="columnheader">T3 Code</span>
+                <span role="columnheader">Providers</span>
+                <span role="columnheader" />
               </div>
-            ))}
-          </div>
+              {updating.map((row) => (
+                <div
+                  key={row.environmentId ?? "this-app"}
+                  role="row"
+                  className="col-span-full grid grid-cols-subgrid border-b border-border/50 py-1.5 last:border-b-0"
+                >
+                  <span role="cell" className="max-w-32 min-w-0">
+                    <span className="sr-only">{row.label}</span>
+                    <MiddleTruncate value={row.label} aria-hidden />
+                  </span>
+                  <span role="cell">
+                    {row.app !== null ? APP_LABELS[row.app] : null}
+                    {row.app === null && row.skipped !== null ? (
+                      <span className="text-muted-foreground">Skipped</span>
+                    ) : null}
+                    {row.app === "this-app" ? (
+                      <span className="block text-muted-foreground text-xs">restarts last</span>
+                    ) : null}
+                  </span>
+                  <span role="cell">
+                    {row.providers.map((provider, index) => (
+                      <Fragment key={provider}>
+                        <span className="whitespace-nowrap">{provider}</span>
+                        {index < row.providers.length - 1 ? ", " : null}
+                      </Fragment>
+                    ))}
+                  </span>
+                  <span role="cell" className="text-right">
+                    {row.environmentId !== null && restarting.has(row.environmentId) ? (
+                      <RunningThreads environmentId={row.environmentId} />
+                    ) : null}
+                  </span>
+                </div>
+              ))}
+            </div>
+          )}
           {skipped.length > 0 ? (
             <Collapsible>
               <CollapsibleTrigger className="flex items-center gap-1 text-muted-foreground text-xs hover:text-foreground data-panel-open:[&_svg]:rotate-90">
@@ -242,11 +261,13 @@ function UpdateEverythingDialogContent({
           </p>
         ) : null}
         <AlertDialogClose ref={cancelRef} render={<Button variant="outline" disabled={busy} />}>
-          Cancel
+          {empty ? "Close" : "Cancel"}
         </AlertDialogClose>
-        <Button disabled={disabledReason !== null || busy} onClick={onConfirm}>
-          {confirmLabel}
-        </Button>
+        {empty ? null : (
+          <Button disabled={disabledReason !== null || busy} onClick={onConfirm}>
+            {confirmLabel}
+          </Button>
+        )}
       </AlertDialogFooter>
     </>
   );