diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6cc9b164..7563f789 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,13 +12,13 @@ plugins {
 val appPackageId = "com.yogeshpaliyal.keypass"
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
 
         applicationId = appPackageId
         minSdk = 23
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1432
         versionName = "1.4.32"
 
diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/DashboardComposeActivity.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/DashboardComposeActivity.kt
index 34dc1da8..a2ea4283 100644
--- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/DashboardComposeActivity.kt
+++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/DashboardComposeActivity.kt
@@ -5,8 +5,10 @@ import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
@@ -69,6 +71,7 @@ class DashboardComposeActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         if (BuildConfig.DEBUG.not()) {
             window.setFlags(
                 WindowManager.LayoutParams.FLAG_SECURE,
@@ -137,7 +140,7 @@ fun Dashboard() {
 
     Scaffold(bottomBar = {
         KeyPassBottomBar()
-    }) { paddingValues ->
+    }, modifier = Modifier.safeDrawingPadding()) { paddingValues ->
         Surface(modifier = Modifier.padding(paddingValues)) {
             CurrentPage()