diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/home/HomeFragment.kt b/app/src/main/java/org/jellyfin/androidtv/ui/home/HomeFragment.kt
index 05b424b28..ca07981db 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/home/HomeFragment.kt
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/home/HomeFragment.kt
@@ -69,6 +69,7 @@ class HomeFragment : Fragment() {
 						}
 					}
 					.fillMaxSize(),
+				maxLifecycle = Lifecycle.State.RESUMED,
 				onUpdate = { fragment ->
 					rowsSupportFragment = fragment
 				}
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/search/SearchFragment.kt b/app/src/main/java/org/jellyfin/androidtv/ui/search/SearchFragment.kt
index f3b76a536..a60fbd8bf 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/search/SearchFragment.kt
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/search/SearchFragment.kt
@@ -28,6 +28,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.compose.AndroidFragment
 import androidx.fragment.compose.content
 import androidx.leanback.app.RowsSupportFragment
+import androidx.lifecycle.Lifecycle
 import org.jellyfin.androidtv.ui.search.composable.SearchTextInput
 import org.jellyfin.androidtv.ui.search.composable.SearchVoiceInput
 import org.jellyfin.androidtv.ui.shared.toolbar.MainToolbar
@@ -130,6 +131,7 @@ class SearchFragment : Fragment() {
 					}
 					.padding(top = 5.dp)
 					.fillMaxSize(),
+				maxLifecycle = Lifecycle.State.RESUMED,
 				onUpdate = { fragment ->
 					rowsSupportFragment = fragment
 					fragment.adapter = searchFragmentDelegate.rowsAdapter