diff --git a/modules/ui-search/src/main/java/tm/alashow/datmusic/ui/search/SearchViewModel.kt b/modules/ui-search/src/main/java/tm/alashow/datmusic/ui/search/SearchViewModel.kt
index d42e7ed3..0a52e5ef 100644
--- a/modules/ui-search/src/main/java/tm/alashow/datmusic/ui/search/SearchViewModel.kt
+++ b/modules/ui-search/src/main/java/tm/alashow/datmusic/ui/search/SearchViewModel.kt
@@ -55,9 +55,10 @@ internal class SearchViewModel @Inject constructor(
     private val playbackConnection: PlaybackConnection,
 ) : ViewModel() {
 
-    private val searchQuery = MutableStateFlow("")
+    val initialQuery = handle.get(QUERY_KEY) ?: ""
+    private val searchQuery = MutableStateFlow(initialQuery)
     private val searchFilter = handle.getStateFlow("search_filter", viewModelScope, SearchFilter.from(handle.get(SEARCH_BACKENDS_KEY)))
-    private val searchTrigger = handle.getStateFlow("search_trigger", viewModelScope, SearchTrigger(handle.get(QUERY_KEY) ?: ""))
+    private val searchTrigger = handle.getStateFlow("search_trigger", viewModelScope, SearchTrigger(initialQuery))
 
     private val captchaError = MutableStateFlow<ApiCaptchaError?>(null)