diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridResults.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridResults.kt
index e0d09170..66b666ac 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridResults.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridResults.kt
@@ -28,6 +28,7 @@ fun <T : SavableSearchable> LazyListScope.GridResults(
     if (before != null) {
         item(
             key = "$key-before",
+            contentType = { "$key-before" },
         ) {
             val isTop = !reverse || items.isEmpty() && after == null
             val isBottom = reverse || items.isEmpty() && after == null
@@ -53,7 +54,8 @@ fun <T : SavableSearchable> LazyListScope.GridResults(
         rows,
         key = {
             "$key-$it"
-        }
+        },
+        contentType = { key }
     ) {
 
         val isFirst = it == 0 && before == null
@@ -104,6 +106,7 @@ fun <T : SavableSearchable> LazyListScope.GridResults(
     if (after != null) {
         item(
             key = "$key-after",
+            contentType = { "$key-after" },
         ) {
             val isTop = reverse || items.isEmpty() && before == null
             val isBottom = !reverse || items.isEmpty() && before == null
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListResults.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListResults.kt
index 9055fc61..914aed57 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListResults.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListResults.kt
@@ -38,6 +38,7 @@ fun <T : SavableSearchable> LazyListScope.ListResults(
     if (before != null) {
         item(
             key = "$key-before",
+            contentType = { "$key-before" },
         ) {
             ListItemSurface(
                 isFirst = true,
@@ -55,6 +56,7 @@ fun <T : SavableSearchable> LazyListScope.ListResults(
         key = {
             "$key-${items[it].key}"
         },
+        contentType = { key },
     ) {
         val item = items[it]
         val showDetails = it == selectedIndex
@@ -73,6 +75,7 @@ fun <T : SavableSearchable> LazyListScope.ListResults(
     if (after != null) {
         item(
             key = "$key-after",
+            contentType = { "$key-after" },
         ) {
             ListItemSurface(
                 isFirst = before == null && items.isEmpty(),