diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt
index 2f15624d32..d93eb7c1a7 100644
--- a/Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt
+++ b/Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt
@@ -16,7 +16,6 @@
 
 package androidx.compose.samples.crane.base
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -26,6 +25,7 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -53,7 +53,6 @@ import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ExploreSection(
     widthSize: WindowWidthSizeClass,
@@ -72,7 +71,7 @@ fun ExploreSection(
 
             LazyVerticalStaggeredGrid(
                 columns = StaggeredGridCells.Adaptive(200.dp),
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier.fillMaxWidth().imePadding(),
                 horizontalArrangement = Arrangement.spacedBy(8.dp),
                 content = {
                     itemsIndexed(exploreList) { _, exploreItem ->
diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt
index d5a2917453..fa0e74d04c 100644
--- a/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt
+++ b/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt
@@ -232,6 +232,7 @@ private fun SearchContent(
                 )
             )
         },
+        label = "SearchContent"
     ) { targetState ->
         when (targetState) {
             CraneScreen.Fly -> FlySearchContent(