diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt
index a85e4e02..454988c5 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsOtherPage.kt
@@ -19,6 +19,7 @@ import com.machiav3lli.fdroid.R
 import com.machiav3lli.fdroid.content.Preferences
 import com.machiav3lli.fdroid.ui.compose.components.prefs.PreferenceGroup
 import com.machiav3lli.fdroid.ui.dialog.BaseDialog
+import com.machiav3lli.fdroid.ui.dialog.EnumSelectionPrefDialogUI
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -65,8 +66,12 @@ fun PrefsOtherPage() {
 
         if (openDialog.value) {
             BaseDialog(openDialogCustom = openDialog) {
-                when (dialogPref) {
-                    // TODO
+                when (dialogPref?.default?.value) {
+                    is String -> {} //TODO
+                    is Preferences.Enumeration<*> -> EnumSelectionPrefDialogUI(
+                        prefKey = dialogPref as Preferences.Key<Preferences.Enumeration<*>>,
+                        openDialogCustom = openDialog
+                    )
                     else -> {}
                 }
             }
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt
index 812439f0..8633b70d 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsPersonalPage.kt
@@ -19,6 +19,7 @@ import com.machiav3lli.fdroid.R
 import com.machiav3lli.fdroid.content.Preferences
 import com.machiav3lli.fdroid.ui.compose.components.prefs.PreferenceGroup
 import com.machiav3lli.fdroid.ui.dialog.BaseDialog
+import com.machiav3lli.fdroid.ui.dialog.EnumSelectionPrefDialogUI
 import com.machiav3lli.fdroid.ui.dialog.LanguagePrefDialogUI
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -72,8 +73,12 @@ fun PrefsPersonalPage() {
 
         if (openDialog.value) {
             BaseDialog(openDialogCustom = openDialog) {
-                when (dialogPref) {
-                    Preferences.Key.Language -> LanguagePrefDialogUI(
+                when (dialogPref?.default?.value) {
+                    is String -> LanguagePrefDialogUI(
+                        openDialogCustom = openDialog
+                    )
+                    is Preferences.Enumeration<*> -> EnumSelectionPrefDialogUI(
+                        prefKey = dialogPref as Preferences.Key<Preferences.Enumeration<*>>,
                         openDialogCustom = openDialog
                     )
                     else -> {}
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt
index 8383808c..371cde8a 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsUpdatesPage.kt
@@ -19,6 +19,8 @@ import com.machiav3lli.fdroid.R
 import com.machiav3lli.fdroid.content.Preferences
 import com.machiav3lli.fdroid.ui.compose.components.prefs.PreferenceGroup
 import com.machiav3lli.fdroid.ui.dialog.BaseDialog
+import com.machiav3lli.fdroid.ui.dialog.EnumSelectionPrefDialogUI
+import com.machiav3lli.fdroid.ui.dialog.LanguagePrefDialogUI
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -80,8 +82,14 @@ fun PrefsUpdatesPage() {
 
         if (openDialog.value) {
             BaseDialog(openDialogCustom = openDialog) {
-                when (dialogPref) {
-                    // TODO
+                when (dialogPref?.default?.value) {
+                    is String -> LanguagePrefDialogUI(
+                        openDialogCustom = openDialog
+                    )
+                    is Preferences.Enumeration<*> -> EnumSelectionPrefDialogUI(
+                        prefKey = dialogPref as Preferences.Key<Preferences.Enumeration<*>>,
+                        openDialogCustom = openDialog
+                    )
                     else -> {}
                 }
             }