diff --git a/packages/pluggableWidgets/safe-area-view-native/CHANGELOG.md b/packages/pluggableWidgets/safe-area-view-native/CHANGELOG.md
index c4eb191bc..610ed41ca 100644
--- a/packages/pluggableWidgets/safe-area-view-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/safe-area-view-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+-   We fixed the issue where navigation buttons were being overlapped due to improper safe area handling.
+
+## [3.1.0] - 2025-4-25
+
 -   We fixed the issue where the header is going outside of page in some android versions.
 
 ## [3.0.1] - 2025-3-18
diff --git a/packages/pluggableWidgets/safe-area-view-native/package.json b/packages/pluggableWidgets/safe-area-view-native/package.json
index af5426da0..feb51b958 100644
--- a/packages/pluggableWidgets/safe-area-view-native/package.json
+++ b/packages/pluggableWidgets/safe-area-view-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "safe-area-view-native",
   "widgetName": "SafeAreaView",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/packages/pluggableWidgets/safe-area-view-native/src/SafeAreaView.tsx b/packages/pluggableWidgets/safe-area-view-native/src/SafeAreaView.tsx
index 149cae2ae..8421a932a 100644
--- a/packages/pluggableWidgets/safe-area-view-native/src/SafeAreaView.tsx
+++ b/packages/pluggableWidgets/safe-area-view-native/src/SafeAreaView.tsx
@@ -3,33 +3,18 @@ import { flattenStyles } from "@mendix/piw-native-utils-internal";
 import { SafeAreaViewStyle, defaultSafeAreaViewStyle } from "./ui/Styles";
 import { SafeAreaViewProps } from "../typings/SafeAreaViewProps";
 import { SafeAreaView as SafeAreaViewComponent } from "react-native-safe-area-context";
-import { useBottomTabBarHeight } from "@react-navigation/bottom-tabs";
 import { View } from "react-native";
 
-export function useSafeBottomTabBarHeight(): number {
-    try {
-        const height = useBottomTabBarHeight();
-        return height;
-    } catch (e) {
-        return 0;
-    }
-}
-
 export const SafeAreaView = (props: SafeAreaViewProps<SafeAreaViewStyle>): JSX.Element => {
     const styles = flattenStyles(defaultSafeAreaViewStyle, props.style);
-    const tabBarHeight = useSafeBottomTabBarHeight();
 
-    const isBottomBarActive = tabBarHeight > 0;
     return (
-        <SafeAreaViewComponent
-            edges={isBottomBarActive ? ["top", "left", "right"] : undefined}
-            style={{ flex: 1, ...{ backgroundColor: styles.container.backgroundColor } }}
-            pointerEvents={"box-none"}
-            testID={props.name}
-        >
-            <View style={styles.container} pointerEvents={"box-none"}>
-                {props.content}
-            </View>
-        </SafeAreaViewComponent>
+        <View style={{ flex: 1, backgroundColor: styles.container.backgroundColor }}>
+            <SafeAreaViewComponent style={{ flex: 1 }} pointerEvents={"box-none"} testID={props.name}>
+                <View style={styles.container} pointerEvents={"box-none"}>
+                    {props.content}
+                </View>
+            </SafeAreaViewComponent>
+        </View>
     );
 };
diff --git a/packages/pluggableWidgets/safe-area-view-native/src/package.xml b/packages/pluggableWidgets/safe-area-view-native/src/package.xml
index db3f8bef5..80b8cdade 100644
--- a/packages/pluggableWidgets/safe-area-view-native/src/package.xml
+++ b/packages/pluggableWidgets/safe-area-view-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="SafeAreaView" version="3.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="SafeAreaView" version="3.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="SafeAreaView.xml" />
         </widgetFiles>