diff --git a/src/core/settings/pages/general/general.html b/src/core/settings/pages/general/general.html
index 2358295de..1ed053f9d 100644
--- a/src/core/settings/pages/general/general.html
+++ b/src/core/settings/pages/general/general.html
@@ -7,7 +7,7 @@
     <ion-item text-wrap>
         <ion-label><h2>{{ 'core.settings.language' | translate }}</h2></ion-label>
         <ion-select [(ngModel)]="selectedLanguage" (ngModelChange)="languageChanged()" interface="action-sheet">
-            <ion-option *ngFor="let code of languageCodes" [value]="code">{{ languages[code] }}</ion-option>
+            <ion-option *ngFor="let entry of languages" [value]="entry.code">{{ entry.name }}</ion-option>
         </ion-select>
     </ion-item>
     <ion-item text-wrap *ngIf="rteSupported">
diff --git a/src/core/settings/pages/general/general.ts b/src/core/settings/pages/general/general.ts
index e6fbd9256..54aac1ca3 100644
--- a/src/core/settings/pages/general/general.ts
+++ b/src/core/settings/pages/general/general.ts
@@ -34,8 +34,7 @@ import { CoreConfigConstants } from '../../../../configconstants';
 })
 export class CoreSettingsGeneralPage {
 
-    languages = {};
-    languageCodes = [];
+    languages = [];
     selectedLanguage: string;
     rteSupported: boolean;
     richTextEditor: boolean;
@@ -46,8 +45,20 @@ export class CoreSettingsGeneralPage {
             private domUtils: CoreDomUtilsProvider,
             localNotificationsProvider: CoreLocalNotificationsProvider) {
 
-        this.languages = CoreConfigConstants.languages;
-        this.languageCodes = Object.keys(this.languages);
+        // Get the supported languages.
+        const languages = CoreConfigConstants.languages;
+        for (const code in languages) {
+            this.languages.push({
+                code: code,
+                name: languages[code]
+            });
+        }
+
+        // Sort them by name.
+        this.languages.sort((a, b) => {
+            return a.name.localeCompare(b.name);
+        });
+
         langProvider.getCurrentLanguage().then((currentLanguage) => {
             this.selectedLanguage = currentLanguage;
         });