diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt b/husky/app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt
index 9c2143dd..5df8fc8a 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt
@@ -72,8 +72,7 @@ class SearchActivity : BottomSheetActivity() {
         super.onCreateOptionsMenu(menu)
 
         menuInflater.inflate(R.menu.search_toolbar, menu)
-        val searchView = menu.findItem(R.id.action_search)
-            .actionView as SearchView
+        val searchView = menu.findItem(R.id.action_search).actionView as SearchView
         setupSearchView(searchView)
 
         searchView.setQuery(viewModel.currentQuery, false)
diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt b/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
index 98fab634..40941faf 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
@@ -44,7 +44,7 @@ import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.visible
 import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 abstract class SearchFragment<T> :
     Fragment(R.layout.fragment_search),
@@ -52,7 +52,7 @@ abstract class SearchFragment<T> :
     SwipeRefreshLayout.OnRefreshListener {
 
     private val binding by viewBinding(FragmentSearchBinding::bind)
-    protected val searchViewModel: SearchViewModel by viewModel<SearchViewModel>()
+    protected val searchViewModel: SearchViewModel by activityViewModel<SearchViewModel>()
 
     private var snackbarErrorRetry: Snackbar? = null
 
diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchHashtagsFragment.kt b/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchHashtagsFragment.kt
index 2259683c..acb4b81b 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchHashtagsFragment.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchHashtagsFragment.kt
@@ -23,6 +23,7 @@ import com.keylesspalace.tusky.entity.HashTag
 import com.keylesspalace.tusky.util.NetworkState
 
 class SearchHashtagsFragment : SearchFragment<HashTag>() {
+
     override val networkStateRefresh: LiveData<NetworkState>
         get() = searchViewModel.networkStateHashTagRefresh
     override val networkState: LiveData<NetworkState>