diff --git a/apps/src/tests/Test2232.tsx b/apps/src/tests/Test2232.tsx
index 7cc4d2020d..4ad2eaf79a 100644
--- a/apps/src/tests/Test2232.tsx
+++ b/apps/src/tests/Test2232.tsx
@@ -35,7 +35,7 @@ const App = () => (
         component={SettingsScreen}
         options={{
           headerTintColor: 'hotpink',
-          headerBackTitleVisible: false,
+          headerBackButtonDisplayMode: 'minimal',
           headerTitle: () => (
             <View style={{ gap: 16, flexDirection: 'row' }}>
               <Square color="green" size={20} />
diff --git a/src/components/Screen.tsx b/src/components/Screen.tsx
index 122a9042b2..a5eec05b76 100644
--- a/src/components/Screen.tsx
+++ b/src/components/Screen.tsx
@@ -95,6 +95,7 @@ export const InnerScreen = React.forwardRef<View, ScreenProps>(
         isNativeStack,
         gestureResponseDistance,
         onGestureCancel,
+        style,
         ...props
       } = rest;
 
@@ -125,6 +126,11 @@ export const InnerScreen = React.forwardRef<View, ScreenProps>(
         <DelayedFreeze freeze={freezeOnBlur && activityState === 0}>
           <AnimatedScreen
             {...props}
+            // Hierarchy of screens is handled on the native side and setting zIndex value causes this issue:
+            // https://github.com/software-mansion/react-native-screens/issues/2345
+            // With below change of zIndex, we force RN diffing mechanism to NOT include detaching and attaching mutation in one transaction.
+            // Detailed information can be found here https://github.com/software-mansion/react-native-screens/pull/2351
+            style={[style, { zIndex: undefined }]}
             activityState={activityState}
             sheetAllowedDetents={sheetAllowedDetents}
             sheetLargestUndimmedDetent={sheetLargestUndimmedDetent}