diff --git a/src/lib/i18n.js b/src/lib/i18n.js
index d52b2500..e532f723 100644
--- a/src/lib/i18n.js
+++ b/src/lib/i18n.js
@@ -175,13 +175,6 @@ function getAllLanguageInfos() {
 function getAllLanguageInfoArray(translateFn, includeSystemDefault) {
     const ret = [];
 
-    if (includeSystemDefault) {
-        ret.push({
-            code: '',
-            displayName: translateFn('System Default')
-        });
-    }
-
     for (const code in allLanguages) {
         if (!Object.prototype.hasOwnProperty.call(allLanguages, code)) {
             continue;
@@ -195,6 +188,17 @@ function getAllLanguageInfoArray(translateFn, includeSystemDefault) {
         });
     }
 
+    ret.sort(function (lang1, lang2) {
+        return lang1.code.localeCompare(lang2.code);
+    });
+
+    if (includeSystemDefault) {
+        ret.splice(0, 0, {
+            code: '',
+            displayName: translateFn('System Default')
+        });
+    }
+
     return ret;
 }