diff --git a/packages/app/src/SessionSubpanel.tsx b/packages/app/src/SessionSubpanel.tsx
index adce25193..e037de902 100644
--- a/packages/app/src/SessionSubpanel.tsx
+++ b/packages/app/src/SessionSubpanel.tsx
@@ -267,6 +267,12 @@ export default function SessionSubpanel({
   const [rowId, setRowId] = useState<string | undefined>(undefined);
   const [aliasWith, setAliasWith] = useState<WithClause[]>([]);
 
+  useEffect(() => {
+    return () => {
+      setDrawerOpen(false);
+    };
+  }, [setDrawerOpen]);
+
   const [tsQuery, setTsQuery] = useQueryState(
     'ts',
     parseAsInteger.withOptions({ history: 'replace' }),
@@ -467,6 +473,8 @@ export default function SessionSubpanel({
             source={traceSource}
             rowId={rowId}
             aliasWith={aliasWith}
+            isNestedPanel={true}
+            withOverlay={true}
             onClose={() => {
               setDrawerOpen(false);
               setRowId(undefined);
diff --git a/packages/app/src/components/DBRowSidePanel.tsx b/packages/app/src/components/DBRowSidePanel.tsx
index 8de925a0d..90a715d23 100644
--- a/packages/app/src/components/DBRowSidePanel.tsx
+++ b/packages/app/src/components/DBRowSidePanel.tsx
@@ -88,6 +88,7 @@ type DBRowSidePanelProps = {
   aliasWith?: WithClause[];
   onClose: () => void;
   isNestedPanel?: boolean;
+  withOverlay?: boolean;
   breadcrumbPath?: BreadcrumbPath;
   onBreadcrumbClick?: BreadcrumbNavigationCallback;
 };
@@ -527,6 +528,7 @@ export default function DBRowSidePanelErrorBoundary({
   aliasWith,
   source,
   isNestedPanel,
+  withOverlay,
   breadcrumbPath = [],
   onBreadcrumbClick,
 }: DBRowSidePanelProps) {
@@ -566,7 +568,7 @@ export default function DBRowSidePanelErrorBoundary({
     <Drawer
       opened={rowId != null}
       withCloseButton={false}
-      withOverlay={!isNestedPanel}
+      withOverlay={withOverlay ?? !isNestedPanel}
       onClose={() => {
         if (!subDrawerOpen) {
           _onClose();