diff --git a/frontend/src/components/Chat/SystemPromptSetup.styles.ts b/frontend/src/components/Chat/SystemPromptSetup.styles.ts
index 623771e2f0..8552109409 100644
--- a/frontend/src/components/Chat/SystemPromptSetup.styles.ts
+++ b/frontend/src/components/Chat/SystemPromptSetup.styles.ts
@@ -1,4 +1,5 @@
 import { makeStyles, tokens } from '@fluentui/react-components'
+import { mobileTouchTarget } from '../../styles/touchTargets'
 
 export const useSystemPromptSetupStyles = makeStyles({
   root: {
@@ -15,6 +16,7 @@ export const useSystemPromptSetupStyles = makeStyles({
   },
   header: {
     color: tokens.colorNeutralForeground2,
+    ...mobileTouchTarget,
   },
   body: {
     display: 'flex',
diff --git a/frontend/src/hooks/useTour.test.ts b/frontend/src/hooks/useTour.test.ts
index abe6fbd05b..b291299905 100644
--- a/frontend/src/hooks/useTour.test.ts
+++ b/frontend/src/hooks/useTour.test.ts
@@ -53,8 +53,10 @@ describe('useTour', () => {
     expect(result.current.tourProps.floatingOptions).toEqual({
       hideArrow: true,
       shiftOptions: {
+        boundary: [],
         crossAxis: true,
         padding: 12,
+        rootBoundary: 'viewport',
       },
     })
   })
diff --git a/frontend/src/hooks/useTour.ts b/frontend/src/hooks/useTour.ts
index fb4204bbaf..1cd7a77b89 100644
--- a/frontend/src/hooks/useTour.ts
+++ b/frontend/src/hooks/useTour.ts
@@ -14,8 +14,11 @@ const TOUR_VIEWPORT_PADDING_PX = 12
 const JOYRIDE_FLOATING_OPTIONS = {
   hideArrow: true,
   shiftOptions: {
+    // The tooltip portal must use the viewport, not a target's narrower scroll parent.
+    boundary: [] as Element[],
     crossAxis: true,
     padding: TOUR_VIEWPORT_PADDING_PX,
+    rootBoundary: 'viewport',
   },
 } as const
 const JOYRIDE_OPTIONS = {