diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
index 20d0c483a..d9f3b632d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
@@ -51,6 +51,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.os.LocaleListCompat
 import androidx.core.view.ContentInfoCompat
 import androidx.core.view.OnReceiveContentListener
 import androidx.core.view.isGone
@@ -534,9 +535,28 @@ class ComposeActivity :
         )
     }
 
+    private fun mergeLocaleListCompat(list: MutableList<Locale>, localeListCompat: LocaleListCompat) {
+        for (index in 0 until localeListCompat.size()) {
+            val locale = localeListCompat[index]
+            if (locale != null && !list.contains(locale)) {
+                list.add(locale)
+            }
+        }
+    }
+
     private fun setupLanguageSpinner(initialLanguage: String?) {
-        val locales = Locale.getAvailableLocales()
-            .filter { it.country.isNullOrEmpty() && it.script.isNullOrEmpty() && it.variant.isNullOrEmpty() } // Only "base" languages, "en" but not "en_DK"
+        val locales = mutableListOf<Locale>()
+        mergeLocaleListCompat(locales, AppCompatDelegate.getApplicationLocales()) // configured app languages first
+        mergeLocaleListCompat(locales, LocaleListCompat.getDefault()) // then configured system languages
+        locales.addAll( // finally, other languages
+            // Only "base" languages, "en" but not "en_DK"
+            Locale.getAvailableLocales().filter {
+                it.country.isNullOrEmpty() &&
+                    it.script.isNullOrEmpty() &&
+                    it.variant.isNullOrEmpty()
+            }
+        )
+
         var currentLocaleIndex = locales.indexOfFirst { it.language == initialLanguage }
         if (currentLocaleIndex < 0) {
             Log.e(TAG, "Error looking up language tag '$initialLanguage', falling back to english")