diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21d3f1f60..4e26eac43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
+- Japanese, Afrikaans, Filipino, Thai and Vietnamese language support ([#5684](https://github.com/lbryio/lbry-desktop/issues/5684))
+
 ### Changed
 
 - Keyboard shortcut additions and changes _community pr!_ ([#5717](https://github.com/lbryio/lbry-desktop/pull/5717))
diff --git a/ui/component/settingLanguage/view.jsx b/ui/component/settingLanguage/view.jsx
index 2d31ebe39..b6aaddeba 100644
--- a/ui/component/settingLanguage/view.jsx
+++ b/ui/component/settingLanguage/view.jsx
@@ -8,9 +8,9 @@ import { getDefaultLanguage } from 'util/default-languages';
 
 type Props = {
   language: string,
-  setLanguage: string => void,
+  setLanguage: (string) => void,
   searchInLanguage: boolean,
-  setSearchInLanguage: boolean => void,
+  setSearchInLanguage: (boolean) => void,
 };
 
 function SettingLanguage(props: Props) {
@@ -41,11 +41,16 @@ function SettingLanguage(props: Props) {
           'Multi-language support is brand new and incomplete. Switching your language may have unintended consequences, like glossolalia.'
         )}
       >
-        {Object.keys(languages).map(language => (
-          <option key={language} value={language}>
-            {languages[language]}
-          </option>
-        ))}
+        {Object.values(languages)
+          .sort()
+          .map((language) => {
+            const lang = String(language);
+            return (
+              <option key={lang} value={lang}>
+                {lang}
+              </option>
+            );
+          })}
       </FormField>
       {previousLanguage && <Spinner type="small" />}
       <FormField