diff --git a/src/components/TestToolsModal.tsx b/src/components/TestToolsModal.tsx
index 0d39860a2dc7d..bfa6af2173684 100644
--- a/src/components/TestToolsModal.tsx
+++ b/src/components/TestToolsModal.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react';
+import React from 'react';
 import {useOnyx} from 'react-native-onyx';
 import useIsAuthenticated from '@hooks/useIsAuthenticated';
 import useLocalize from '@hooks/useLocalize';
@@ -6,9 +6,8 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import {getBrowser, isChromeIOS} from '@libs/Browser';
 import Navigation from '@navigation/Navigation';
-import toggleTestToolsModal from '@userActions/TestTool';
+import toggleTestToolsModal, {shouldShowProfileTool} from '@userActions/TestTool';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -39,17 +38,6 @@ function TestToolsModal() {
     const isAuthenticated = useIsAuthenticated();
     const route = getRouteBasedOnAuthStatus(isAuthenticated, activeRoute);
 
-    const shouldShowProfileTool = useMemo(() => {
-        const browser = getBrowser();
-        const isSafariOrFirefox = browser === CONST.BROWSER.SAFARI || browser === CONST.BROWSER.FIREFOX;
-
-        if (isSafariOrFirefox || isChromeIOS()) {
-            return false;
-        }
-
-        return true;
-    }, []);
-
     return (
         <Modal
             isVisible={!!isTestToolsModalOpen}
@@ -67,7 +55,7 @@ function TestToolsModal() {
                 >
                     {translate('initialSettingsPage.troubleshoot.releaseOptions')}
                 </Text>
-                {shouldShowProfileTool && <ProfilingToolMenu />}
+                {shouldShowProfileTool() && <ProfilingToolMenu />}
                 <ClientSideLoggingToolMenu />
                 {!!shouldStoreLogs && (
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.debugConsole')}>
diff --git a/src/libs/actions/TestTool.ts b/src/libs/actions/TestTool.ts
index eb686a6d265c0..b3a3f2257a93f 100644
--- a/src/libs/actions/TestTool.ts
+++ b/src/libs/actions/TestTool.ts
@@ -1,8 +1,9 @@
 import throttle from 'lodash/throttle';
 import Onyx from 'react-native-onyx';
+import {getBrowser, isChromeIOS} from '@libs/Browser';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import * as Modal from './Modal';
+import {close} from './Modal';
 
 let isTestToolsModalOpen = false;
 Onyx.connect({
@@ -20,7 +21,7 @@ function toggleTestToolsModal() {
             Onyx.set(ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN, !isTestToolsModalOpen);
         };
         if (!isTestToolsModalOpen) {
-            Modal.close(toggleIsTestToolsModalOpen);
+            close(toggleIsTestToolsModalOpen);
             return;
         }
         toggleIsTestToolsModalOpen();
@@ -29,4 +30,15 @@ function toggleTestToolsModal() {
     throttledToggle();
 }
 
+function shouldShowProfileTool() {
+    const browser = getBrowser();
+    const isSafariOrFirefox = browser === CONST.BROWSER.SAFARI || browser === CONST.BROWSER.FIREFOX;
+
+    if (isSafariOrFirefox || isChromeIOS()) {
+        return false;
+    }
+    return true;
+}
+
+export {shouldShowProfileTool};
 export default toggleTestToolsModal;
diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index 41e5673c34af3..f7c040bb95f10 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -12,6 +12,7 @@ import ImportOnyxState from '@components/ImportOnyxState';
 import LottieAnimations from '@components/LottieAnimations';
 import MenuItemList from '@components/MenuItemList';
 import {useOptionsList} from '@components/OptionListContextProvider';
+import ProfilingToolMenu from '@components/ProfilingToolMenu';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
@@ -29,7 +30,8 @@ import {setShouldMaskOnyxState} from '@libs/actions/MaskOnyx';
 import ExportOnyxState from '@libs/ExportOnyxState';
 import Navigation from '@libs/Navigation/Navigation';
 import {clearOnyxAndResetApp} from '@userActions/App';
-import * as Report from '@userActions/Report';
+import {navigateToConciergeChat} from '@userActions/Report';
+import {shouldShowProfileTool} from '@userActions/TestTool';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -126,7 +128,7 @@ function TroubleshootPage() {
                                 <Text style={[styles.textNormal, styles.colorMuted]}>{translate('initialSettingsPage.troubleshoot.description')}</Text>{' '}
                                 <TextLink
                                     style={styles.link}
-                                    onPress={() => Report.navigateToConciergeChat()}
+                                    onPress={() => navigateToConciergeChat()}
                                 >
                                     {translate('initialSettingsPage.troubleshoot.submitBug')}
                                 </TextLink>
@@ -136,6 +138,7 @@ function TroubleshootPage() {
                     >
                         <View style={[styles.flex1, styles.mt5]}>
                             <View>
+                                {shouldShowProfileTool() && <ProfilingToolMenu />}
                                 <ClientSideLoggingToolMenu />
                                 <TestToolRow title={translate('initialSettingsPage.troubleshoot.maskExportOnyxStateData')}>
                                     <Switch