diff --git a/suite-native/app/src/navigation/RootStackNavigator.tsx b/suite-native/app/src/navigation/RootStackNavigator.tsx
index 5862d568ca4..8edb08655bf 100644
--- a/suite-native/app/src/navigation/RootStackNavigator.tsx
+++ b/suite-native/app/src/navigation/RootStackNavigator.tsx
@@ -50,6 +50,10 @@ export const RootStackNavigator = () => {
             initialRouteName={getInitialRouteName()}
             screenOptions={stackNavigationOptionsConfig}
         >
+            <RootStack.Screen
+                name={RootStackRoutes.OnboardingStack}
+                component={OnboardingStackNavigator}
+            />
             <RootStack.Screen name={RootStackRoutes.AppTabs} component={AppTabNavigator} />
             <RootStack.Screen
                 options={{ title: RootStackRoutes.AccountSettings }}
@@ -87,10 +91,6 @@ export const RootStackNavigator = () => {
             />
             {/* Navigation flows that start by push from bottom animation on the first screen of its stack. */}
             <RootStack.Group screenOptions={{ animation: 'slide_from_bottom' }}>
-                <RootStack.Screen
-                    name={RootStackRoutes.OnboardingStack}
-                    component={OnboardingStackNavigator}
-                />
                 <RootStack.Screen
                     name={RootStackRoutes.AccountsImport}
                     component={AccountsImportStackNavigator}
@@ -107,18 +107,17 @@ export const RootStackNavigator = () => {
                     name={RootStackRoutes.ReceiveStack}
                     component={ReceiveStackNavigator}
                 />
+                <RootStack.Screen
+                    name={RootStackRoutes.DeviceSettingsStack}
+                    component={DeviceSettingsStackNavigator}
+                />
                 <RootStack.Screen
                     name={RootStackRoutes.AuthorizeDeviceStack}
                     component={AuthorizeDeviceStackNavigator}
                     options={{
-                        ...stackNavigationOptionsConfig,
                         gestureEnabled: false,
                     }}
                 />
-                <RootStack.Screen
-                    name={RootStackRoutes.DeviceSettingsStack}
-                    component={DeviceSettingsStackNavigator}
-                />
             </RootStack.Group>
         </RootStack.Navigator>
     );