diff --git a/app/(app)/_layout.tsx b/app/(app)/_layout.tsx
index 78d5b59..de98f67 100644
--- a/app/(app)/_layout.tsx
+++ b/app/(app)/_layout.tsx
@@ -1,6 +1,6 @@
 import { MedplumClient } from "@medplum/core";
 import { useMedplumContext } from "@medplum/react-hooks";
-import { Redirect, router, Slot } from "expo-router";
+import { Redirect, router, Stack } from "expo-router";
 import { useEffect } from "react";
 
 import { LoadingScreen } from "@/components/LoadingScreen";
@@ -68,7 +68,13 @@ export default function AppLayout() {
   return (
     <ChatProvider>
       {isPractitioner && <PractitionerBanner />}
-      <Slot />
+      <Stack
+        screenOptions={{
+          headerShown: false,
+          // Prevents flickering:
+          animation: "none",
+        }}
+      />
     </ChatProvider>
   );
 }
diff --git a/components/ChatHeader.tsx b/components/ChatHeader.tsx
index fd2330d..824eb77 100644
--- a/components/ChatHeader.tsx
+++ b/components/ChatHeader.tsx
@@ -57,11 +57,8 @@ function BackButton({ isSelectionMode, onCancelSelection }: BackButtonProps) {
   const handlePress = () => {
     if (isSelectionMode) {
       onCancelSelection?.();
-    } else if (router.canGoBack()) {
-      router.back();
-    } else {
-      router.replace("/");
     }
+    router.dismissTo("/");
   };
 
   return (