diff --git a/src/components/TestDrive/TestDriveBanner.tsx b/src/components/TestDrive/TestDriveBanner.tsx
index b1070b87c7202..af464655659bc 100644
--- a/src/components/TestDrive/TestDriveBanner.tsx
+++ b/src/components/TestDrive/TestDriveBanner.tsx
@@ -17,7 +17,7 @@ function TestDriveBanner({onPress}: TestDriveBannerProps) {
     const {translate} = useLocalize();
 
     return (
-        <View style={[styles.highlightBG]}>
+        <View style={styles.highlightBG}>
             <View style={[styles.gap2, styles.alignItemsCenter, styles.flexRow, styles.justifyContentCenter, styles.h10]}>
                 <Text>
                     {shouldUseNarrowLayout
diff --git a/src/components/TestDrive/TestDriveDemo.tsx b/src/components/TestDrive/TestDriveDemo.tsx
index 902bef99817a5..52ad6b33aea42 100644
--- a/src/components/TestDrive/TestDriveDemo.tsx
+++ b/src/components/TestDrive/TestDriveDemo.tsx
@@ -5,6 +5,7 @@ import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOffli
 import EmbeddedDemo from '@components/EmbeddedDemo';
 import Modal from '@components/Modal';
 import SafeAreaConsumer from '@components/SafeAreaConsumer';
+import {shouldOpenRHPVariant} from '@components/SidePanel/RHPVariantTest';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useIsPaidPolicyAdmin from '@hooks/useIsPaidPolicyAdmin';
 import useOnboardingMessages from '@hooks/useOnboardingMessages';
@@ -14,6 +15,7 @@ import useParentReportAction from '@hooks/useParentReportAction';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {completeTestDriveTask} from '@libs/actions/Task';
+import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import {isAdminRoom} from '@libs/ReportUtils';
 import {getTestDriveURL} from '@libs/TourUtils';
@@ -74,6 +76,10 @@ function TestDriveDemo() {
         InteractionManager.runAfterInteractions(() => {
             Navigation.goBack();
 
+            if (shouldOpenRHPVariant()) {
+                Log.hmmm('[AdminTestDriveModal] User was redirected to Workspace Editor, skipping navigation to admin room');
+                return;
+            }
             if (isAdminRoom(onboardingReport)) {
                 Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(onboardingReport?.reportID));
             }