diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt
index 92276c7b..be960cbe 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt
@@ -9,8 +9,10 @@ import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
@@ -46,7 +48,8 @@ internal fun HomeView() {
     Scaffold(
         topBar = { TitleAppBar(stringResource(id = R.string.app_name)) },
         contentWindowInsets = WindowInsets.displayCutout
-            .only(WindowInsetsSides.Horizontal),
+            .only(WindowInsetsSides.Horizontal)
+            .union(WindowInsets.navigationBars),
         floatingActionButton = {
             ExtendedFloatingActionButton(
                 onClick = { onEvent(UiEvent.OnConnectDeviceClick) },
diff --git a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/ProfileScreen.kt b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/ProfileScreen.kt
index 6d3f6b8a..761b9250 100644
--- a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/ProfileScreen.kt
+++ b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/ProfileScreen.kt
@@ -8,8 +8,10 @@ import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
@@ -69,7 +71,9 @@ internal fun ProfileScreen() {
 
     Scaffold(
         contentWindowInsets = WindowInsets.displayCutout
-            .only(WindowInsetsSides.Horizontal),
+            .only(WindowInsetsSides.Horizontal)
+            .union(WindowInsets.navigationBars),
+//            .only(NavigationS),
         topBar = {
             // The device name is derived directly from the current state.
             val deviceName = (uiState as? ProfileUiState.Connected)