diff --git a/app/src/main/kotlin/app/lawnchair/lawnicons/repository/IconRepository.kt b/app/src/main/kotlin/app/lawnchair/lawnicons/repository/IconRepository.kt
index dee296b010b..1c18cdda2e8 100644
--- a/app/src/main/kotlin/app/lawnchair/lawnicons/repository/IconRepository.kt
+++ b/app/src/main/kotlin/app/lawnchair/lawnicons/repository/IconRepository.kt
@@ -95,7 +95,7 @@ class IconRepositoryImpl @Inject constructor(application: Application) : IconRep
         }.toPersistentList()
 
         _searchedIconInfoModel.value = IconInfoModel(
-            iconCount = _iconInfoModel.value.iconCount,
+            iconCount = _searchedIconInfoModel.value.iconCount,
             iconInfo = filteredIcons,
         )
     }
diff --git a/app/src/main/kotlin/app/lawnchair/lawnicons/ui/destination/Home.kt b/app/src/main/kotlin/app/lawnchair/lawnicons/ui/destination/Home.kt
index 111e8127e87..3e98e37a917 100644
--- a/app/src/main/kotlin/app/lawnchair/lawnicons/ui/destination/Home.kt
+++ b/app/src/main/kotlin/app/lawnchair/lawnicons/ui/destination/Home.kt
@@ -49,10 +49,6 @@ fun Home(
         val iconInfoModel by iconInfoModel.collectAsStateWithLifecycle()
         val searchedIconInfoModel by searchedIconInfoModel.collectAsStateWithLifecycle()
         val iconRequestModel by iconRequestModel.collectAsStateWithLifecycle()
-        val searchMode = searchMode
-        val searchTerm = searchTerm
-
-        var expandSearch by remember { mutableStateOf(false) }
         val context = LocalContext.current
 
         val lazyGridState = rememberLazyGridState()
diff --git a/app/src/main/kotlin/app/lawnchair/lawnicons/viewmodel/LawniconsViewModel.kt b/app/src/main/kotlin/app/lawnchair/lawnicons/viewmodel/LawniconsViewModel.kt
index 153d44305d4..69fbd2e5f57 100644
--- a/app/src/main/kotlin/app/lawnchair/lawnicons/viewmodel/LawniconsViewModel.kt
+++ b/app/src/main/kotlin/app/lawnchair/lawnicons/viewmodel/LawniconsViewModel.kt
@@ -30,6 +30,8 @@ class LawniconsViewModel @Inject constructor(
     @JvmField
     val isIconRequestButtonClicked = userTipsRepository.hasClickedIconRequestButton()
 
+    var expandSearch by mutableStateOf(false)
+
     private var _searchMode by mutableStateOf(SearchMode.LABEL)
     private var _searchTerm by mutableStateOf("")