diff --git a/src/views/appstore.html b/src/views/appstore.html
index 5c09ac21c..6049d4f86 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -290,7 +290,33 @@
       <br/>
       <a href="https://forum.cloudron.io/category/5/app-requests" target="_blank">{{ 'appstore.appMissing' | tr }}</a>
     </div>
+    <div class="col-md-12" ng-show="category === '' && popularApps.length">
+      <div class="row-no-margin">
+        <div class="col-sm-12">
+          <h2>{{ 'appstore.category.popular' | tr }}</h2>
+        </div>
+      </div>
+      <div class="row-no-margin">
+        <div class="col-sm-1 appstore-item" ng-repeat="app in popularApps">
+          <div class="appstore-item-content highlight" ng-click="gotoApp(app)" ng-class="{ 'appstore-item-content-testing': app.releaseState === 'unstable' }">
+            <span class="badge badge-danger appstore-item-badge-testing" ng-show="app.releaseState === 'unstable'">{{ 'appstore.unstable' | tr }}</span>
+            <div class="appstore-item-content-icon col-same-height">
+              <img ng-src="{{app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
+            </div>
+            <div class="appstore-item-content-description col-same-height">
+              <h4 class="appstore-item-content-title">{{ app.manifest.title }}</h4>
+              <div class="appstore-item-content-tagline text-muted">{{ app.manifest.tagline }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="col-md-12" ng-show="apps.length">
+      <div class="row-no-margin">
+        <div class="col-sm-12">
+          <h2>{{ 'appstore.category.all' | tr }}</h2>
+        </div>
+      </div>
       <div class="row-no-margin">
         <div class="col-sm-1 appstore-item" ng-repeat="app in apps">
           <div class="appstore-item-content highlight" ng-click="gotoApp(app)" ng-class="{ 'appstore-item-content-testing': app.releaseState === 'unstable' }">
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 2fbe83db2..05674836d 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -14,6 +14,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
 
     $scope.ready = false;
     $scope.apps = [];
+    $scope.popularApps = [];
     $scope.config = Client.getConfig();
     $scope.user = Client.getUserInfo();
     $scope.users = [];
@@ -425,6 +426,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
 
             var token = $scope.searchString.toUpperCase();
 
+            $scope.popularApps = [];
             $scope.apps = apps.filter(function (app) {
                 if (app.manifest.id.toUpperCase().indexOf(token) !== -1) return true;
                 if (app.manifest.title.toUpperCase().indexOf(token) !== -1) return true;
@@ -432,7 +434,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
                 if (app.manifest.tags.join().toUpperCase().indexOf(token) !== -1) return true;
                 if (app.manifest.description.toUpperCase().indexOf(token) !== -1) return true;
                 return false;
-            });
+                });
         });
     };
 
@@ -471,7 +473,9 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
             if (error) return $timeout($scope.showCategory.bind(null, category), 1000);
 
             if (!$scope.category) {
-                $scope.apps = apps.slice(0).sort(function (a1, a2) { return a1.manifest.title.localeCompare(a2.manifest.title); });
+                $scope.apps = apps.slice(0).filter(function (app) { return !app.featured; }).sort(function (a1, a2) { return a1.manifest.title.localeCompare(a2.manifest.title); });
+                $scope.popularApps = apps.slice(0).filter(function (app) { return app.featured; }).sort(function (a1, a2) { return a2.ranking - a1.ranking; });
+                // $scope.apps = apps.slice(0).sort(function (a1, a2) { return a1.manifest.title.localeCompare(a2.manifest.title); });
             } else if ($scope.category === 'featured') {
                 $scope.apps = apps.filter(function (app) { return app.featured; }).sort(function (a1, a2) { return a2.ranking - a1.ranking; }); // reverse sort
             } else if ($scope.category === 'new') {