diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt
index ff45b8af..4994fab7 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt
@@ -39,6 +39,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -135,6 +136,7 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks {
         setupAdapters()
         return ComposeView(requireContext()).apply {
             setContent {
+                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
                 AppTheme(
                     darkTheme = when (Preferences[Preferences.Key.Theme]) {
                         is Preferences.Theme.System -> isSystemInDarkTheme()
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/SortFilterSheet.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/SortFilterSheet.kt
index 92a52a24..1482e7ab 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/SortFilterSheet.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/SortFilterSheet.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -71,6 +72,7 @@ class SortFilterSheet() : FullscreenBottomSheetDialogFragment() {
     ): View {
         super.onCreate(savedInstanceState)
         return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 AppTheme(
                     darkTheme = when (Preferences[Preferences.Key.Theme]) {