diff --git a/src/components/Appbar/Appbar.tsx b/src/components/Appbar/Appbar.tsx
index d4a5875986..d59c626769 100644
--- a/src/components/Appbar/Appbar.tsx
+++ b/src/components/Appbar/Appbar.tsx
@@ -254,6 +254,7 @@ const Appbar = ({
         !theme.isV3 && { elevation },
       ]}
       elevation={elevation as MD3Elevation}
+      container
       {...rest}
     >
       {shouldAddLeftSpacing ? <View style={spacingStyle} /> : null}
diff --git a/src/components/Banner.tsx b/src/components/Banner.tsx
index 5e343c5785..09aa344d55 100644
--- a/src/components/Banner.tsx
+++ b/src/components/Banner.tsx
@@ -194,6 +194,7 @@ const Banner = ({
       {...rest}
       style={[!theme.isV3 && styles.elevation, { opacity }, style]}
       theme={theme}
+      container
       {...(theme.isV3 && { elevation })}
     >
       <View style={[styles.wrapper, contentStyle]}>
diff --git a/src/components/BottomNavigation/BottomNavigationBar.tsx b/src/components/BottomNavigation/BottomNavigationBar.tsx
index 1453b07ebf..05264c610a 100644
--- a/src/components/BottomNavigation/BottomNavigationBar.tsx
+++ b/src/components/BottomNavigation/BottomNavigationBar.tsx
@@ -574,6 +574,7 @@ const BottomNavigationBar = <Route extends BaseRoute>({
           : 'none'
       }
       onLayout={onLayout}
+      container
     >
       <Animated.View
         style={[styles.barContent, { backgroundColor }]}
diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx
index cb800710bd..2e4d2cf519 100644
--- a/src/components/Button/Button.tsx
+++ b/src/components/Button/Button.tsx
@@ -350,6 +350,7 @@ const Button = (
         ] as Animated.WithAnimatedValue<StyleProp<ViewStyle>>
       }
       {...(isV3 && { elevation: elevation })}
+      container
     >
       <TouchableRipple
         borderless
diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx
index 0d9cd33b3c..5604f28335 100644
--- a/src/components/Card/Card.tsx
+++ b/src/components/Card/Card.tsx
@@ -304,6 +304,7 @@ const Card = (
         elevation: isMode('elevated') ? computedElevation : 0,
       })}
       testID={`${testID}-container`}
+      container
       {...rest}
     >
       {isMode('outlined') && (
diff --git a/src/components/Chip/Chip.tsx b/src/components/Chip/Chip.tsx
index 8ed23b7436..0e48e5c145 100644
--- a/src/components/Chip/Chip.tsx
+++ b/src/components/Chip/Chip.tsx
@@ -316,6 +316,7 @@ const Chip = ({
       {...rest}
       testID={`${testID}-container`}
       theme={theme}
+      container
     >
       <TouchableRipple
         borderless
diff --git a/src/components/FAB/AnimatedFAB.tsx b/src/components/FAB/AnimatedFAB.tsx
index 94468e5687..ecfe7e1c60 100644
--- a/src/components/FAB/AnimatedFAB.tsx
+++ b/src/components/FAB/AnimatedFAB.tsx
@@ -404,6 +404,7 @@ const AnimatedFAB = ({
       ]}
       {...(isV3 && { elevation: md3Elevation })}
       theme={theme}
+      container
     >
       <Animated.View
         style={[
diff --git a/src/components/FAB/FAB.tsx b/src/components/FAB/FAB.tsx
index 260da3079c..70777798ec 100644
--- a/src/components/FAB/FAB.tsx
+++ b/src/components/FAB/FAB.tsx
@@ -289,6 +289,7 @@ const FAB = forwardRef<View, Props>(
         pointerEvents={visible ? 'auto' : 'none'}
         testID={`${testID}-container`}
         {...(isV3 && { elevation: md3Elevation })}
+        container
       >
         <TouchableRipple
           borderless
diff --git a/src/components/IconButton/IconButton.tsx b/src/components/IconButton/IconButton.tsx
index 68615a4008..47a87901ca 100644
--- a/src/components/IconButton/IconButton.tsx
+++ b/src/components/IconButton/IconButton.tsx
@@ -181,6 +181,7 @@ const IconButton = forwardRef<View, Props>(
           !isV3 && disabled && styles.disabled,
           style,
         ]}
+        container
         {...(isV3 && { elevation: 0 })}
       >
         <TouchableRipple
diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx
index 0e241a2c01..55922c1fc2 100644
--- a/src/components/Menu/Menu.tsx
+++ b/src/components/Menu/Menu.tsx
@@ -675,6 +675,7 @@ const Menu = ({
                 {...(theme.isV3 && { elevation })}
                 testID={`${testID}-surface`}
                 theme={theme}
+                container
               >
                 {(scrollableMenuHeight && (
                   <ScrollView
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
index acba4d64ea..be16a5abde 100644
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -220,6 +220,7 @@ function Modal({
           testID={`${testID}-surface`}
           theme={theme}
           style={[{ opacity }, styles.content, contentContainerStyle]}
+          container
         >
           {children}
         </Surface>
diff --git a/src/components/Searchbar.tsx b/src/components/Searchbar.tsx
index 11c79d2e9a..b8bf345e9d 100644
--- a/src/components/Searchbar.tsx
+++ b/src/components/Searchbar.tsx
@@ -275,6 +275,7 @@ const Searchbar = forwardRef<TextInputHandles, Props>(
         ]}
         testID={`${testID}-container`}
         {...(theme.isV3 && { elevation })}
+        container
         theme={theme}
       >
         <IconButton
diff --git a/src/components/Snackbar.tsx b/src/components/Snackbar.tsx
index 137a69ae82..d11bc91a62 100644
--- a/src/components/Snackbar.tsx
+++ b/src/components/Snackbar.tsx
@@ -321,6 +321,7 @@ const Snackbar = ({
           style,
         ]}
         testID={testID}
+        container
         {...(isV3 && { elevation })}
         {...rest}
       >
diff --git a/src/components/Surface.tsx b/src/components/Surface.tsx
index fc551f688d..3b46d099e1 100644
--- a/src/components/Surface.tsx
+++ b/src/components/Surface.tsx
@@ -51,6 +51,10 @@ export type Props = Omit<React.ComponentPropsWithRef<typeof View>, 'style'> & {
    */
   testID?: string;
   ref?: React.RefObject<View>;
+  /**
+   * @internal
+   */
+  container?: boolean;
 };
 
 const MD2Surface = forwardRef<View, Props>(
@@ -161,6 +165,7 @@ const SurfaceIOS = forwardRef<
       testID,
       children,
       mode = 'elevated',
+      container,
       ...props
     },
     ref
@@ -202,12 +207,15 @@ const SurfaceIOS = forwardRef<
         ...(isElevated && getStyleForShadowLayer(elevation, 1)),
         ...filteredStyles,
         ...borderRadiusStyles,
-        flex: flattenedStyles.height || flattenedStyles.flex ? 1 : undefined,
+        flex:
+          flattenedStyles.height || (!container && flattenedStyles.flex)
+            ? 1
+            : undefined,
         backgroundColor: bgColor,
       };
 
       return [outerLayerViewStyles, innerLayerViewStyles];
-    }, [style, elevation, backgroundColor, mode]);
+    }, [style, elevation, backgroundColor, mode, container]);
 
     return (
       <Animated.View