diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
index 8d874982e0d..2ce13f32ef2 100644
--- a/apps/settings/src/components/AppList.vue
+++ b/apps/settings/src/components/AppList.vue
@@ -200,9 +200,13 @@ export default {
 			const apps = [...this.$store.getters.getAllApps, ...exApps]
 				.filter(app => app.name.toLowerCase().search(this.search.toLowerCase()) !== -1)
 				.sort(function(a, b) {
-					const sortStringA = '' + (a.active ? 0 : 1) + (a.update ? 0 : 1) + a.name
-					const sortStringB = '' + (b.active ? 0 : 1) + (b.update ? 0 : 1) + b.name
-					return OC.Util.naturalSortCompare(sortStringA, sortStringB)
+					const natSortDiff = OC.Util.naturalSortCompare(a, b)
+					if (natSortDiff === 0) {
+						const sortStringA = '' + (a.active ? 0 : 1) + (a.update ? 0 : 1)
+						const sortStringB = '' + (b.active ? 0 : 1) + (b.update ? 0 : 1)
+						return Number(sortStringA) - Number(sortStringB)
+					}
+					return natSortDiff
 				})
 
 			if (this.category === 'installed') {