diff --git a/src/app/globals.css b/src/app/globals.css
index d0971df7b..b195983b4 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -72,6 +72,7 @@
   --animate-sheet-up: sheet-up 250ms cubic-bezier(0.22, 1, 0.36, 1) both;
   --animate-sheet-left: sheet-left 220ms cubic-bezier(0.22, 1, 0.36, 1) both;
   --animate-pop-in: pop-in 180ms cubic-bezier(0.34, 1.3, 0.64, 1) both;
+  --animate-dialog-rise: dialog-rise 220ms cubic-bezier(0.22, 1, 0.36, 1) both;
   --animate-action-tray-in: action-tray-in 160ms cubic-bezier(0.22, 1, 0.36, 1) both;
   --animate-shimmer: shimmer 1.4s linear infinite;
 }
@@ -1681,6 +1682,17 @@ summary::-webkit-details-marker {
   }
 }
 
+@keyframes dialog-rise {
+  from {
+    opacity: 0;
+    transform: translateY(12px) scale(0.98);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
 @keyframes action-tray-in {
   from {
     opacity: 0;
diff --git a/src/app/mockups/answer-evidence-popups/page.tsx b/src/app/mockups/answer-evidence-popups/page.tsx
index 791dff886..831b4050d 100644
--- a/src/app/mockups/answer-evidence-popups/page.tsx
+++ b/src/app/mockups/answer-evidence-popups/page.tsx
@@ -206,6 +206,30 @@ function ButtonText({ children }: { children: ReactNode }) {
   return <span className="min-w-0 truncate">{children}</span>;
 }
 
+function DesktopSourcePreviewDemo() {
+  return (
+    <div className="relative min-h-[24rem] overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-4">
+      <p className="max-w-[68ch] text-base-minus font-medium leading-[1.56] text-[color:var(--text-heading)]">
+        Clozapine monitoring should include FBC/ANC, myocarditis symptoms, metabolic checks, constipation prevention,
+        and shared-care communication.
+      </p>
+      <div className="relative mt-3 w-fit">
+        <SourceCapsule />
+        <div
+          aria-hidden
+          className="pointer-events-none absolute left-0 top-[calc(100%+0.5rem)] z-10 w-[min(100%,36rem)] motion-safe:animate-pop-in"
+        >
+          <SourcePreviewPopover />
+        </div>
+      </div>
+      <p className="mt-24 max-w-[68ch] text-xs leading-5 text-[color:var(--text-muted)]">
+        The answer body stays in place. The preview floats above nearby content instead of pushing the support card
+        down.
+      </p>
+    </div>
+  );
+}
+
 function SourcePreviewPopover() {
   return (
     <div className="max-w-xl rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-elevated)]">
@@ -576,11 +600,11 @@ function MobileEvidencePanel({ selected }: { selected: string }) {
 function DesktopEvidenceModal() {
   return (
     <div className="relative overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-subtle)] p-6">
-      <div aria-hidden="true" className="absolute inset-0 bg-black/45 backdrop-blur-[2px]" />
+      <div aria-hidden="true" className="absolute inset-0 bg-black/50 backdrop-blur-[2px]" />
       <div
         role="dialog"
         aria-label="Evidence"
-        className="relative mx-auto w-full max-w-2xl overflow-hidden rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface-raised)] shadow-[var(--shadow-elevated)]"
+        className="relative mx-auto w-full max-w-3xl overflow-hidden rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface-raised)] shadow-[var(--shadow-elevated)] motion-safe:animate-dialog-rise motion-reduce:animate-none"
       >
         <div className="flex items-start justify-between gap-3 border-b border-[color:var(--border)] p-3 sm:p-4">
           <div className="min-w-0">
@@ -667,18 +691,9 @@ export default function AnswerEvidencePopupsMockupPage() {
       <div className="grid gap-6">
         <Section
           title="1. Desktop source capsule preview"
-          body="Small inline popover opened from the source-backed capsule underneath the natural-language answer."
+          body="Anchored floating popover opened from the source-backed capsule. The answer body stays in place with no layout reflow."
         >
-          <div className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-4">
-            <p className="max-w-[68ch] text-base-minus font-medium leading-[1.56] text-[color:var(--text-heading)]">
-              Clozapine monitoring should include FBC/ANC, myocarditis symptoms, metabolic checks, constipation
-              prevention, and shared-care communication.
-            </p>
-            <SourceCapsule />
-            <div className="mt-3">
-              <SourcePreviewPopover />
-            </div>
-          </div>
+          <DesktopSourcePreviewDemo />
         </Section>
 
         <Section
@@ -711,7 +726,7 @@ export default function AnswerEvidencePopupsMockupPage() {
 
         <Section
           title="4. Desktop evidence modal"
-          body="Desktop uses the same centered sheet modal as mobile: dimmed backdrop, no answer reflow, and a wider evidence panel."
+          body="Centered sheet modal with a stronger backdrop, wider evidence panel, and a refined rise-in entrance on desktop."
         >
           <DesktopEvidenceModal />
         </Section>
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 14ae434f9..bdac825b4 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -3186,10 +3186,7 @@ export function ClinicalDashboard({
   }
 
   function handleFollowUpQuote(quote: QuoteCard) {
-    setQuery(createQuoteFollowUp(quote));
-    window.requestAnimationFrame(() => {
-      window.setTimeout(() => focusComposerInput(), 120);
-    });
+    stageAnswerFollowUpDraft(createQuoteFollowUp(quote));
   }
 
   function handlePickFollowUpSuggestion(suggestion: string) {
@@ -3279,18 +3276,10 @@ export function ClinicalDashboard({
       return;
     }
 
-    const drawer = document.getElementById("answer-evidence-drawer") as HTMLDetailsElement | null;
-    if (!drawer) {
-      setActionNotice({
-        tone: "warning",
-        message: "Evidence appears after a source-backed answer is generated.",
-      });
-      return;
-    }
-    drawer.scrollIntoView({ block: "start", behavior: "smooth" });
-    if (!drawer.open) {
-      drawer.querySelector<HTMLElement>("summary")?.click();
-    }
+    setActionNotice({
+      tone: "warning",
+      message: "Evidence appears after a source-backed answer is generated.",
+    });
   }
 
   function navigateMobileSection(href: string, options: { updateHistory?: boolean } = {}) {
@@ -3807,9 +3796,7 @@ export function ClinicalDashboard({
             searchMode === "answer"
               ? compactMobileModeHome
                 ? "mb-0"
-                : answer && answerFollowUpSuggestions.length > 0
-                  ? "mb-[calc(11.5rem+env(safe-area-inset-bottom))] sm:mb-24"
-                  : "mb-[calc(6.5rem+env(safe-area-inset-bottom))] sm:mb-24"
+                : "mb-[calc(5.25rem+env(safe-area-inset-bottom))] sm:mb-24"
               : hasMobileBottomSearch
                 ? bottomSearchScrollHidden
                   ? "mb-0 sm:mb-0"
diff --git a/src/components/applications-launcher-page.tsx b/src/components/applications-launcher-page.tsx
index 6c151a097..6145f852e 100644
--- a/src/components/applications-launcher-page.tsx
+++ b/src/components/applications-launcher-page.tsx
@@ -875,11 +875,11 @@ export function ApplicationsLauncherWorkspace({
   const query = controlledQuery ?? localQuery;
   const normalizedQuery = query.trim().toLowerCase();
   const queryDerivedId = useMemo(() => initialToolId(query), [query]);
-  const [selection, setSelection] = useState({
-    queryKey: normalizedQuery,
-    id: initialToolId(query),
-  });
-  const selectedId = selection.queryKey === normalizedQuery ? selection.id : queryDerivedId;
+  const [selection, setSelection] = useState(() => ({
+    queryKey: (controlledQuery ?? "").trim().toLowerCase(),
+    id: initialToolId(controlledQuery),
+  }));
+  const selectedId = detailOpen || selection.queryKey === normalizedQuery ? selection.id : queryDerivedId;
 
   const filteredApps = useMemo(() => {
     return launcherApps.filter((app) => {
diff --git a/src/components/clinical-dashboard/answer-content.tsx b/src/components/clinical-dashboard/answer-content.tsx
index ff148551d..8f7206fb7 100644
--- a/src/components/clinical-dashboard/answer-content.tsx
+++ b/src/components/clinical-dashboard/answer-content.tsx
@@ -36,6 +36,7 @@ import {
   sanitizeAnswerDisplayText,
 } from "@/components/clinical-dashboard/display-text";
 import { useMobilePreviewSheet } from "@/components/clinical-dashboard/use-mobile-preview-sheet";
+import { SourcePreviewPopover } from "@/components/clinical-dashboard/source-preview-popover";
 import { clearCachedSignedUrl, getCachedSignedUrl, setCachedSignedUrl } from "@/lib/signed-url-cache";
 import { normalizeSourceMetadata, sourceStatusLabel } from "@/lib/source-metadata";
 import { clinicalProseUsefulness } from "@/lib/source-text-sanitizer";
@@ -658,10 +659,11 @@ export function NaturalLanguageAnswer({
           </section>
         ) : null}
         {sourceCapsuleButton}
-        {sourcePreviewOpen && canOpenSourcePreview && !usePreviewSheet ? (
-          <div
-            data-testid="source-capsule-preview"
-            className="max-h-[22rem] max-w-xl overflow-y-auto overscroll-contain rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-elevated)] motion-safe:animate-pop-in"
+        {canOpenSourcePreview && !usePreviewSheet ? (
+          <SourcePreviewPopover
+            open={sourcePreviewOpen}
+            onClose={() => setSourcePreviewOpen(false)}
+            anchorRef={sourceCapsuleRef}
           >
             <SourcePreviewContent
               previewSources={previewSources}
@@ -669,7 +671,7 @@ export function NaturalLanguageAnswer({
               copiedQuote={copiedSourceQuote}
               onCopyQuote={copySourceQuote}
             />
-          </div>
+          </SourcePreviewPopover>
         ) : null}
         <Sheet
           open={sourcePreviewOpen && canOpenSourcePreview && usePreviewSheet}
diff --git a/src/components/clinical-dashboard/answer-result-surface.tsx b/src/components/clinical-dashboard/answer-result-surface.tsx
index 94dc917b7..eb853db4c 100644
--- a/src/components/clinical-dashboard/answer-result-surface.tsx
+++ b/src/components/clinical-dashboard/answer-result-surface.tsx
@@ -1,4 +1,4 @@
-"use client";
+"use client";
 
 import Link from "next/link";
 import { type RefObject, useCallback, useEffect, useRef, useState } from "react";
@@ -285,6 +285,7 @@ export function StagedAnswerResultSurface({
             closeButtonClassName="inline-flex h-8 w-8 items-center justify-center rounded-full text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
             contentClassName="max-h-[88dvh] bg-[color:var(--surface-raised)] sm:max-h-[min(80dvh,36rem)] sm:max-w-md"
             bodyClassName="flex flex-col bg-[color:var(--surface-raised)] px-3 pb-0 pt-2 sm:p-3"
+            desktopBackdropClassName="sm:bg-black/50"
             returnFocusRef={clinicalNotesTriggerRef}
             portal
           >
@@ -316,8 +317,9 @@ export function StagedAnswerResultSurface({
                 <Layers className="h-3.5 w-3.5" />
               </span>
             }
-            contentClassName="max-h-[88dvh] bg-[color:var(--surface-raised)] sm:max-h-[min(88dvh,44rem)] sm:max-w-2xl"
+            contentClassName="max-h-[88dvh] bg-[color:var(--surface-raised)] sm:max-h-[min(88dvh,44rem)] sm:max-w-3xl"
             bodyClassName="bg-[color:var(--surface-raised)] px-3 pb-0 pt-2 sm:p-3"
+            desktopBackdropClassName="sm:bg-black/50"
             returnFocusRef={evidenceTriggerRef}
             portal
           >
@@ -362,6 +364,7 @@ export function StagedAnswerResultSurface({
             closeButtonClassName="inline-flex h-8 w-8 items-center justify-center rounded-full text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
             contentClassName="max-h-[88dvh] bg-[color:var(--surface-raised)] sm:max-h-[min(80dvh,36rem)] sm:max-w-lg"
             bodyClassName="flex flex-col bg-[color:var(--surface-raised)] px-3 pb-0 pt-2 sm:p-3"
+            desktopBackdropClassName="sm:bg-black/50"
             returnFocusRef={safetyTriggerRef}
             portal
           >
diff --git a/src/components/clinical-dashboard/master-search-header.tsx b/src/components/clinical-dashboard/master-search-header.tsx
index 002dcf7db..aee03b76f 100644
--- a/src/components/clinical-dashboard/master-search-header.tsx
+++ b/src/components/clinical-dashboard/master-search-header.tsx
@@ -641,11 +641,20 @@ export function MasterSearchHeader({
     }
   }
 
+  const restoreActionMenuFocusRef = useRef(false);
   const closeScope = useCallback((restoreFocus = false) => {
+    restoreActionMenuFocusRef.current = restoreFocus;
     setScopeOpen(false);
-    if (restoreFocus) actionMenuTriggerRef.current?.focus();
   }, []);
 
+  useEffect(() => {
+    if (scopeOpen || !restoreActionMenuFocusRef.current) return;
+    restoreActionMenuFocusRef.current = false;
+    window.requestAnimationFrame(() => {
+      actionMenuTriggerRef.current?.focus({ preventScroll: true });
+    });
+  }, [scopeOpen]);
+
   const closeScopeSheet = useCallback(() => {
     setScopeSheetOpen(false);
     window.requestAnimationFrame(() => actionMenuTriggerRef.current?.focus());
diff --git a/src/components/clinical-dashboard/source-preview-popover.tsx b/src/components/clinical-dashboard/source-preview-popover.tsx
new file mode 100644
index 000000000..f56c8909c
--- /dev/null
+++ b/src/components/clinical-dashboard/source-preview-popover.tsx
@@ -0,0 +1,168 @@
+"use client";
+
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+  type CSSProperties,
+  type ReactNode,
+  type RefObject,
+} from "react";
+import { createPortal } from "react-dom";
+
+import { useDismissableLayer } from "@/components/use-dismissable-layer";
+import { cn } from "@/components/ui-primitives";
+
+type PopoverPlacement = "below" | "above";
+
+const edgePadding = 12;
+const anchorGap = 8;
+const minPopoverHeight = 220;
+
+function computePopoverLayout(anchor: HTMLElement) {
+  const viewport = window.visualViewport;
+  const viewportTop = viewport?.offsetTop ?? 0;
+  const viewportLeft = viewport?.offsetLeft ?? 0;
+  const viewportWidth = viewport?.width ?? window.innerWidth;
+  const viewportHeight = viewport?.height ?? window.innerHeight;
+  const viewportBottom = viewportTop + viewportHeight;
+  const rect = anchor.getBoundingClientRect();
+  const availableAbove = Math.max(0, rect.top - viewportTop - edgePadding);
+  const availableBelow = Math.max(0, viewportBottom - rect.bottom - edgePadding);
+  const placement: PopoverPlacement =
+    availableBelow >= availableAbove + 40 || availableBelow >= minPopoverHeight ? "below" : "above";
+  const available =
+    placement === "below" ? Math.max(0, availableBelow - anchorGap) : Math.max(0, availableAbove - anchorGap);
+  const maxHeight = Math.max(
+    minPopoverHeight,
+    Math.floor(Math.min(available, viewportHeight - edgePadding * 2, 22 * 16)),
+  );
+  const maxWidth = Math.min(36 * 16, viewportWidth - edgePadding * 2);
+  const preferredLeft = rect.left;
+  const left = Math.max(
+    edgePadding + viewportLeft,
+    Math.min(preferredLeft, viewportLeft + viewportWidth - maxWidth - edgePadding),
+  );
+  const top =
+    placement === "below"
+      ? rect.bottom + anchorGap
+      : Math.max(viewportTop + edgePadding, rect.top - anchorGap - maxHeight);
+
+  return { placement, top, left, maxWidth, maxHeight };
+}
+
+export function SourcePreviewPopover({
+  open,
+  onClose,
+  anchorRef,
+  title = "Sources",
+  children,
+}: {
+  open: boolean;
+  onClose: () => void;
+  anchorRef: RefObject<HTMLElement | null>;
+  title?: string;
+  children: ReactNode;
+}) {
+  const surfaceRef = useRef<HTMLDivElement>(null);
+  const [layout, setLayout] = useState<{
+    placement: PopoverPlacement;
+    top: number;
+    left: number;
+    maxWidth: number;
+    maxHeight: number;
+  } | null>(null);
+
+  const updateLayout = useCallback(() => {
+    const anchor = anchorRef.current;
+    if (!anchor) return;
+    setLayout(computePopoverLayout(anchor));
+  }, [anchorRef]);
+
+  useLayoutEffect(() => {
+    if (!open) return;
+    updateLayout();
+  }, [open, updateLayout]);
+
+  useEffect(() => {
+    if (!open) return undefined;
+
+    const handleViewportChange = () => updateLayout();
+    window.addEventListener("resize", handleViewportChange);
+    window.visualViewport?.addEventListener("resize", handleViewportChange);
+    window.visualViewport?.addEventListener("scroll", handleViewportChange);
+    window.addEventListener("scroll", handleViewportChange, true);
+
+    return () => {
+      window.removeEventListener("resize", handleViewportChange);
+      window.visualViewport?.removeEventListener("resize", handleViewportChange);
+      window.visualViewport?.removeEventListener("scroll", handleViewportChange);
+      window.removeEventListener("scroll", handleViewportChange, true);
+    };
+  }, [open, updateLayout]);
+
+  useEffect(() => {
+    if (!open) return undefined;
+
+    function handleEscape(event: KeyboardEvent) {
+      if (event.key !== "Escape") return;
+      event.preventDefault();
+      event.stopPropagation();
+      onClose();
+      window.requestAnimationFrame(() => anchorRef.current?.focus({ preventScroll: true }));
+    }
+
+    document.addEventListener("keydown", handleEscape, true);
+    return () => document.removeEventListener("keydown", handleEscape, true);
+  }, [anchorRef, open, onClose]);
+
+  useEffect(() => {
+    if (!open) return;
+    const focusFrame = window.requestAnimationFrame(() => {
+      const focusTarget =
+        surfaceRef.current?.querySelector<HTMLElement>('[data-sheet-autofocus="true"]') ??
+        surfaceRef.current?.querySelector<HTMLElement>("a[href], button:not([disabled])") ??
+        surfaceRef.current;
+      focusTarget?.focus({ preventScroll: true });
+    });
+    return () => window.cancelAnimationFrame(focusFrame);
+  }, [open]);
+
+  useDismissableLayer({
+    enabled: open,
+    refs: [anchorRef, surfaceRef],
+    restoreFocusRef: anchorRef,
+    onDismiss: () => onClose(),
+  });
+
+  if (!open || typeof document === "undefined") return null;
+
+  const style: CSSProperties = layout
+    ? {
+        top: layout.top,
+        left: layout.left,
+        width: layout.maxWidth,
+        maxHeight: layout.maxHeight,
+      }
+    : { visibility: "hidden" };
+
+  return createPortal(
+    <div
+      ref={surfaceRef}
+      role="dialog"
+      aria-modal="false"
+      aria-label={title}
+      data-testid="source-capsule-preview"
+      data-popover-placement={layout?.placement ?? "below"}
+      style={style}
+      className={cn(
+        "fixed z-[95] min-w-[min(100vw-1.5rem,20rem)] overflow-y-auto overscroll-contain rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-elevated)] motion-safe:animate-pop-in motion-reduce:animate-none",
+      )}
+    >
+      {children}
+    </div>,
+    document.body,
+  );
+}
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 361ba5ad2..7f0ce0995 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -39,6 +39,7 @@ export function Sheet({
   mobilePlacement = "bottom",
   mobileSize = "content",
   portal = false,
+  desktopBackdropClassName,
 }: {
   open: boolean;
   onClose: () => void;
@@ -64,6 +65,7 @@ export function Sheet({
   mobilePlacement?: "bottom" | "top" | "fullscreen";
   mobileSize?: SheetMobileSize;
   portal?: boolean;
+  desktopBackdropClassName?: string;
 }) {
   const panelRef = useRef<HTMLDivElement>(null);
   const closeRef = useRef<HTMLButtonElement>(null);
@@ -147,6 +149,7 @@ export function Sheet({
     <div
       className={cn(
         "fixed inset-0 z-[100] flex bg-black/45 backdrop-blur-[2px] motion-reduce:animate-none motion-reduce:transition-none",
+        desktopBackdropClassName,
         placement !== "left" && "motion-safe:animate-overlay-in",
         placement === "left"
           ? "items-stretch justify-start"
@@ -175,9 +178,9 @@ export function Sheet({
             ? "h-full max-h-dvh max-w-[min(22rem,calc(100vw-1rem))] rounded-r-2xl border-y-0 border-l-0 pt-safe sm:max-h-dvh sm:max-w-[22rem] sm:rounded-l-none sm:rounded-r-2xl sm:pb-0"
             : cn(
                 defaultSheetIsFullscreen
-                  ? "h-dvh max-h-dvh rounded-none border-0 motion-safe:animate-pop-in sm:max-w-none sm:rounded-none lg:h-auto lg:max-h-[calc(100dvh-3rem)] lg:rounded-2xl lg:border lg:border-[color:var(--border-lux)] lg:pb-0"
+                  ? "h-dvh max-h-dvh rounded-none border-0 motion-safe:animate-pop-in sm:max-w-none sm:rounded-none lg:h-auto lg:max-h-[calc(100dvh-3rem)] lg:rounded-2xl lg:border lg:border-[color:var(--border-lux)] lg:pb-0 lg:motion-safe:animate-dialog-rise"
                   : cn(
-                      "sm:max-w-lg sm:rounded-2xl sm:pb-0 sm:motion-safe:animate-pop-in",
+                      "sm:max-w-lg sm:rounded-2xl sm:pb-0 sm:motion-safe:animate-dialog-rise",
                       defaultSheetIsTopAligned
                         ? cn(
                             "max-h-[calc(100dvh-1.5rem)] rounded-2xl motion-safe:animate-pop-in",
diff --git a/src/components/use-dismissable-layer.ts b/src/components/use-dismissable-layer.ts
index 05285b417..783294083 100644
--- a/src/components/use-dismissable-layer.ts
+++ b/src/components/use-dismissable-layer.ts
@@ -38,7 +38,11 @@ export function useDismissableLayer({
       if (event.key !== "Escape") return;
       event.preventDefault();
       onDismiss("escape");
-      window.requestAnimationFrame(() => restoreFocusRef?.current?.focus({ preventScroll: true }));
+      window.requestAnimationFrame(() => {
+        window.requestAnimationFrame(() => {
+          restoreFocusRef?.current?.focus({ preventScroll: true });
+        });
+      });
     }
 
     document.addEventListener("pointerdown", handlePointerDown, true);
diff --git a/tests/supabase-schema.test.ts b/tests/supabase-schema.test.ts
index 32144a386..522d8d115 100644
--- a/tests/supabase-schema.test.ts
+++ b/tests/supabase-schema.test.ts
@@ -792,7 +792,6 @@ describe("Supabase schema Data API grants", () => {
     expect(schema).toContain("index_aliases constant jsonb := jsonb_build_object(");
     expect(schema).toContain("jsonb_array_elements_text(index_aliases -> index_name)");
   });
-
   it("mirrors tightened search_document_chunks owner scope in schema and migration", () => {
     expect(searchDocumentChunksOwnerScopeMigration).toContain("(p_owner_id is null and d.owner_id is null)");
     expect(schema).toContain("create or replace function public.search_document_chunks(");
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index 0593c8ba9..a7a7d0da1 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -1311,7 +1311,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
     expect(popoverMetrics.height).toBeLessThanOrEqual(Math.ceil(popoverMetrics.viewportHeight * 0.72));
     await page.keyboard.press("Escape");
     await expect(scopePopover).toBeHidden();
-    await expect(page.getByRole("button", { name: "Open answer options" })).toBeFocused();
+    await expect(async () => {
+      await expect(page.getByRole("button", { name: "Open answer options" })).toBeFocused();
+    }).toPass({ timeout: 5_000 });
     await expectNoPageHorizontalOverflow(page);
   });
 
@@ -1491,20 +1493,19 @@ test.describe("Clinical KB UI smoke coverage", () => {
       const sourceCapsule = plainAnswer.getByRole("button", { name: "Open answer sources" });
       await expectMinTouchTarget(sourceCapsule);
       await sourceCapsule.click();
-      const sourceSurface = viewport.sheet
-        ? page.getByRole("dialog", { name: "Sources" })
-        : page.getByTestId("source-capsule-preview");
+      const sourceSurface = page.getByRole("dialog", { name: "Sources" });
       await expect(sourceSurface).toBeVisible();
       await expect(sourceSurface.getByTestId("source-capsule-preview-row").first()).toHaveAttribute(
         "href",
         /\/documents\/.+chunk=/,
       );
       await expectMinTouchTarget(sourceSurface.getByTestId("source-capsule-preview-row").first());
-      if (viewport.sheet) {
-        await page.keyboard.press("Escape");
-        await expect(sourceSurface).toHaveCount(0);
-        await expect(sourceCapsule).toBeFocused();
-      } else {
+      await page.keyboard.press("Escape");
+      await expect(sourceSurface).toHaveCount(0);
+      await expect(sourceCapsule).toBeFocused();
+      if (!viewport.sheet) {
+        await sourceCapsule.click();
+        await expect(sourceSurface).toBeVisible();
         await sourceCapsule.click();
         await expect(sourceSurface).toHaveCount(0);
       }