diff --git a/dashboard/src/views/apps.html b/dashboard/src/views/apps.html
index 0b79bd1e8..968650673 100644
--- a/dashboard/src/views/apps.html
+++ b/dashboard/src/views/apps.html
@@ -155,7 +155,7 @@
 
     <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
       <div class="app-grid">
-        <div class="grid-item" ng-class="{ 'stopped': app.runState === 'stopped' }" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'">
+        <div class="grid-item" ng-class="{ 'stopped': app.runState === 'stopped' }" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:labelOrFQDN">
           <div class="grid-item-content" uib-tooltip="{{ app.fqdn }}">
             <a ng-show="app.type !== APP_TYPES.LINK && isOperator(app)" ng-href="#/app/{{ app.id}}/display" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></a>
             <div ng-show="app.type === APP_TYPES.LINK && isOperator(app)" ng-click="applinksEdit.show(app)" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></div>
diff --git a/dashboard/src/views/apps.js b/dashboard/src/views/apps.js
index c1e139723..d10fc18ce 100644
--- a/dashboard/src/views/apps.js
+++ b/dashboard/src/views/apps.js
@@ -45,6 +45,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$translat
         if (tr['app.states.updateAvailable']) $scope.states[3].label = tr['app.states.updateAvailable'];
     });
 
+    // for sorting of the app grid items
+    $scope.labelOrFQDN = function (item) {
+        return item.label || item.fqdn;
+    };
+
     $scope.$watch('selectedTags', function (newVal, oldVal) {
         if (newVal === oldVal) return;