@@ -0,0 +1,35 @@
+import { lazy, Suspense } from "react";
+import { expect, it, vi } from "vite-plus/test";
+
+import { render } from "../../test/render";
+import { RightPanelContentBoundary } from "./RightPanelContentBoundary";
+
+it("contains a failed panel download and recovers when another surface opens", async () => {
+  using _error = vi.spyOn(console, "error").mockImplementation(() => {});
+  const FailedPanel = lazy(async () => {
+    throw new Error("Panel download failed");
+  });
+  await using screen = await render(
+    <>
+      <main>Running chat</main>
+      <RightPanelContentBoundary surfaceId="failed-pr">
+        <Suspense fallback={<span>Loading panel</span>}>
+          <FailedPanel />
+        </Suspense>
+      </RightPanelContentBoundary>
+    </>,
+  );
+  await expect.element(screen.getByRole("button", { name: "Reload app" })).toBeVisible();
+  await expect.element(screen.getByRole("main")).toHaveTextContent("Running chat");
+
+  await screen.rerender(
+    <>
+      <main>Running chat</main>
+      <RightPanelContentBoundary surfaceId="other-panel">
+        <p>Other panel</p>
+      </RightPanelContentBoundary>
+    </>,
+  );
+  await expect.element(screen.getByText("Other panel", { exact: true })).toBeVisible();
+  await expect.element(screen.getByRole("main")).toHaveTextContent("Running chat");
+});
@@ -0,0 +1,29 @@
+import type { ReactNode } from "react";
+
+import { RenderErrorBoundary } from "./RenderErrorBoundary";
+import { Button } from "./ui/button";
+import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "./ui/empty";
+
+export function RightPanelContentBoundary(props: {
+  readonly surfaceId: string;
+  readonly children: ReactNode;
+}) {
+  return (
+    <RenderErrorBoundary
+      resetKeys={[props.surfaceId]}
+      fallback={
+        <Empty>
+          <EmptyHeader>
+            <EmptyTitle>Could not load this panel</EmptyTitle>
+            <EmptyDescription>Reload the app to try again.</EmptyDescription>
+          </EmptyHeader>
+          <Button variant="outline" size="sm" onClick={() => window.location.reload()}>
+            Reload app
+          </Button>
+        </Empty>
+      }
+    >
+      {props.children}
+    </RenderErrorBoundary>
+  );
+}
@@ -104,6 +104,7 @@ import { resolvePullRequestState } from "./pullRequest/pullRequestPresentation";
 import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
 import { observeResize } from "~/lib/observeResize";
 import { surfaceShortcutKey } from "~/lib/surfaceShortcutKey";
+import { RightPanelContentBoundary } from "./RightPanelContentBoundary";
 
 export interface RightPanelTabsProps {
   mode: PreviewPanelMode;
@@ -1545,7 +1546,9 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
             sideChatDisabledReason={props.sideChatDisabledReason ?? null}
           />
         ) : (
-          props.children
+          <RightPanelContentBoundary surfaceId={props.activeSurfaceId}>
+            {props.children}
+          </RightPanelContentBoundary>
         )}
       </div>
     </PreviewPanelShell>