diff --git a/src/components/TestToolsModal.tsx b/src/components/TestToolsModal.tsx
index 68538294d569..0d39860a2dc7 100644
--- a/src/components/TestToolsModal.tsx
+++ b/src/components/TestToolsModal.tsx
@@ -1,8 +1,8 @@
 import React, {useMemo} from 'react';
-import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import useIsAuthenticated from '@hooks/useIsAuthenticated';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -16,6 +16,7 @@ import Button from './Button';
 import ClientSideLoggingToolMenu from './ClientSideLoggingToolMenu';
 import Modal from './Modal';
 import ProfilingToolMenu from './ProfilingToolMenu';
+import ScrollView from './ScrollView';
 import TestToolMenu from './TestToolMenu';
 import TestToolRow from './TestToolRow';
 import Text from './Text';
@@ -24,10 +25,13 @@ function getRouteBasedOnAuthStatus(isAuthenticated: boolean, activeRoute: string
     return isAuthenticated ? ROUTES.SETTINGS_CONSOLE.getRoute(activeRoute) : ROUTES.PUBLIC_CONSOLE_DEBUG.getRoute(activeRoute);
 }
 
+const modalContentMaxHeightPercentage = 0.75;
+
 function TestToolsModal() {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [isTestToolsModalOpen = false] = useOnyx(ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN);
     const [shouldStoreLogs = false] = useOnyx(ONYXKEYS.SHOULD_STORE_LOGS);
-    const {windowWidth} = useWindowDimensions();
+    const {windowWidth, windowHeight} = useWindowDimensions();
     const StyleUtils = useStyleUtils();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -49,10 +53,14 @@ function TestToolsModal() {
     return (
         <Modal
             isVisible={!!isTestToolsModalOpen}
-            type={CONST.MODAL.MODAL_TYPE.CENTERED_SMALL}
+            type={shouldUseNarrowLayout ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CENTERED_SMALL}
             onClose={toggleTestToolsModal}
+            innerContainerStyle={styles.overflowHidden}
         >
-            <View style={[StyleUtils.getTestToolsModalStyle(windowWidth)]}>
+            <ScrollView
+                contentContainerStyle={[StyleUtils.getTestToolsModalStyle(windowWidth), shouldUseNarrowLayout && {...styles.w100, ...styles.pv0}]}
+                style={{maxHeight: windowHeight * modalContentMaxHeightPercentage}}
+            >
                 <Text
                     style={[styles.textLabelSupporting, styles.mt4, styles.mb3]}
                     numberOfLines={1}
@@ -74,7 +82,7 @@ function TestToolsModal() {
                     </TestToolRow>
                 )}
                 <TestToolMenu />
-            </View>
+            </ScrollView>
         </Modal>
     );
 }