diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt
index 09a5b8d14..dce715da4 100644
--- a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt
@@ -34,7 +34,6 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.SearchBundle
 import com.aurora.store.R
@@ -62,8 +61,6 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result),
     private val binding: FragmentSearchResultBinding
         get() = _binding!!
 
-    private val args: SearchResultsFragmentArgs by navArgs()
-
     lateinit var VM: SearchResultViewModel
 
     lateinit var endlessRecyclerOnScrollListener: EndlessRecyclerOnScrollListener
@@ -125,7 +122,7 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result),
             updateController(searchBundle)
         }
 
-        query = args.query
+        query = requireArguments().getString("query")
         query?.let { updateQuery(it) }
 
         lifecycleScope.launch {
@@ -269,6 +266,7 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result),
             ) {
                 query = searchView.text.toString()
                 query?.let {
+                    requireArguments().putString("query", it)
                     queryViewModel(it)
                     return@setOnEditorActionListener true
                 }