diff --git a/src/Expensify.js b/src/Expensify.js
index 71f0a7c80688..6750c365c164 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -24,6 +24,8 @@ import * as User from './libs/actions/User';
 import NetworkConnection from './libs/NetworkConnection';
 import Navigation from './libs/Navigation/Navigation';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
+import PopoverReportActionContextMenu from './pages/home/report/ContextMenu/PopoverReportActionContextMenu';
+import * as ReportActionContextMenu from './pages/home/report/ContextMenu/ReportActionContextMenu';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 // eslint-disable-next-line no-unused-vars
@@ -189,6 +191,9 @@ class Expensify extends PureComponent {
                 {!this.state.isSplashShown && (
                     <>
                         <GrowlNotification ref={Growl.growlRef} />
+                        <PopoverReportActionContextMenu
+                            ref={ReportActionContextMenu.contextMenuRef}
+                        />
                         {/* We include the modal for showing a new update at the top level so the option is always present. */}
                         {this.props.updateAvailable ? <UpdateAppModal /> : null}
                         {this.props.screenShareRequest ? (
diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
index dfb67d739250..ecc67769e8b8 100644
--- a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
+++ b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -14,8 +14,6 @@ import SidebarScreen from '../../../pages/home/sidebar/SidebarScreen';
 import BaseDrawerNavigator from './BaseDrawerNavigator';
 import * as ReportUtils from '../../ReportUtils';
 import reportPropTypes from '../../../pages/reportPropTypes';
-import * as ReportActionContextMenu from '../../../pages/home/report/ContextMenu/ReportActionContextMenu';
-import PopoverReportActionContextMenu from '../../../pages/home/report/ContextMenu/PopoverReportActionContextMenu';
 
 const propTypes = {
     /** Available reports that would be displayed in this navigator */
@@ -82,31 +80,26 @@ class MainDrawerNavigator extends Component {
         // This way routing information is updated (if needed) based on the initial report ID resolved.
         // This is usually needed after login/create account and re-launches
         return (
-            <>
-                <PopoverReportActionContextMenu
-                    ref={ReportActionContextMenu.contextMenuRef}
-                />
-                <BaseDrawerNavigator
-                    drawerContent={({navigation, state}) => {
-                        // This state belongs to the drawer so it should always have the ReportScreen as it's initial (and only) route
-                        const reportIDFromRoute = lodashGet(state, ['routes', 0, 'params', 'reportID']);
-                        return (
-                            <SidebarScreen
-                                navigation={navigation}
-                                reportIDFromRoute={reportIDFromRoute}
-                            />
-                        );
-                    }}
-                    screens={[
-                        {
-                            name: SCREENS.REPORT,
-                            component: ReportScreen,
-                            initialParams: this.initialParams,
-                        },
-                    ]}
-                    isMainScreen
-                />
-            </>
+            <BaseDrawerNavigator
+                drawerContent={({navigation, state}) => {
+                    // This state belongs to the drawer so it should always have the ReportScreen as it's initial (and only) route
+                    const reportIDFromRoute = lodashGet(state, ['routes', 0, 'params', 'reportID']);
+                    return (
+                        <SidebarScreen
+                            navigation={navigation}
+                            reportIDFromRoute={reportIDFromRoute}
+                        />
+                    );
+                }}
+                screens={[
+                    {
+                        name: SCREENS.REPORT,
+                        component: ReportScreen,
+                        initialParams: this.initialParams,
+                    },
+                ]}
+                isMainScreen
+            />
         );
     }
 }