diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
index 718ae26b..9ce4d66b 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
@@ -78,11 +78,11 @@ class SearchableItemVM : ListItemViewModel(), KoinComponent {
 
     val badge = searchable.flatMapLatest {
         if (it == null) emptyFlow() else badgeService.getBadge(it)
-    }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+    }.stateIn(viewModelScope, SharingStarted.Lazily, null)
 
     val icon = searchable.combine(iconSize) { sh, sz -> sh to sz }.flatMapLatest { (s, size) ->
         if (s == null || size == 0) emptyFlow() else iconService.getIcon(s, size)
-    }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+    }.stateIn(viewModelScope, SharingStarted.Lazily, null)
 
     val tags = searchable.flatMapLatest {
         if (it == null) emptyFlow() else tagsService.getTags(it)
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
index 4e7f0ef3..66c5e17e 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
@@ -88,7 +88,7 @@ fun GridItem(
     var bounds by remember { mutableStateOf(Rect.Zero) }
 
     Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
-        val badge by remember(item.key) { viewModel.badge }.collectAsStateWithLifecycle()
+        val badge by viewModel.badge.collectAsStateWithLifecycle()
         val icon by viewModel.icon.collectAsStateWithLifecycle()
 
         val launchOnPress = !item.preferDetailsOverLaunch