diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
index 4291cec66..34a16596c 100644
--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
@@ -37,6 +37,7 @@ import androidx.compose.material3.NavigationRailItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
@@ -75,10 +76,12 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {
                 containerColor = Color.Transparent,
                 contentColor = MaterialTheme.colorScheme.onBackground,
                 bottomBar = {
-                    NiaBottomBar(
-                        onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,
-                        currentDestination = currentDestination
-                    )
+                    if (windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact || windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact) {
+                        NiaBottomBar(
+                            onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,
+                            currentDestination = currentDestination
+                        )
+                    }
                 }
             ) { padding ->
                 Row(
@@ -90,6 +93,14 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {
                             )
                         )
                 ) {
+                    if (windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact && windowSizeClass.heightSizeClass != WindowHeightSizeClass.Compact) {
+                        NiaNavRail(
+                            onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,
+                            currentDestination = currentDestination,
+                            modifier = Modifier.safeDrawingPadding()
+                        )
+                    }
+
                     NiaNavHost(
                         windowSizeClass = windowSizeClass,
                         navController = navController,