diff --git a/src/js/client.js b/src/js/client.js
index c6fa16e29..614bb1330 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -3330,9 +3330,10 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         var that = this;
 
         callback = callback || function () {};
-        repository = repository || 'core';
 
-        get('/api/v1/appstore/apps?repository=' + repository, null, function (error, data, status) {
+        this._appstoreRepository = repository || 'core';
+
+        get('/api/v1/appstore/apps?repository=' + this._appstoreRepository, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
@@ -3343,11 +3344,9 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     };
 
     Client.prototype.getAppstoreAppsFast = function (repository, callback) {
-        if (this._appstoreAppCache.length !== 0) return callback(null, this._appstoreAppCache);
+        if (this._appstoreAppCache.length !== 0 && this._appstoreRepository === repository) return callback(null, this._appstoreAppCache);
 
-        repository = repository || 'core';
-
-        this.getAppstoreApps(repository, callback);
+        this.getAppstoreApps(repository || 'core', callback);
     };
 
     Client.prototype.getSubscription = function (callback) {
diff --git a/src/theme.scss b/src/theme.scss
index c9fe7dade..ac7e50f0a 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -852,31 +852,35 @@ multiselect {
         margin: auto;
         max-width: 1200px;
 
-        > input {
+        > * {
             margin: 0 10px;
-            margin-right: 15px;
         }
 
-        > button, > .dropdown > .btn {
-            border-radius: 0;
-            display: inline-block;
-        }
+        // > input {
+        //     margin: 0 10px;
+        //     margin-right: 15px;
+        // }
 
-        > button:first-of-type {
-            margin-left: 5px;
-        }
+        // > button, > .dropdown > .btn {
+        //     border-radius: 0;
+        //     display: inline-block;
+        // }
 
-        @media(max-width:768px) {
-            flex-wrap: wrap;
+        // > button:first-of-type {
+        //     margin-left: 5px;
+        // }
 
-            > input {
-                margin: 0;
-            }
+        // @media(max-width:768px) {
+        //     flex-wrap: wrap;
 
-            > button, > .dropdown {
-                display: none;
-            }
-        }
+        //     > input {
+        //         margin: 0;
+        //     }
+
+        //     > button, > .dropdown {
+        //         display: none;
+        //     }
+        // }
     }
 }
 
diff --git a/src/views/appstore.html b/src/views/appstore.html
index cc8744632..6fa80820f 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -354,19 +354,26 @@
 
   <div ng-show="ready && validSubscription" class="ng-cloak appstore-toolbar">
     <div class="appstore-toolbar-content">
-      <div>
-        <button class="btn btn-primary" type="button" ng-click="setRepository('core')">Core</button>
-        <button class="btn btn-outline" type="button" ng-click="setRepository('community')">Community</button>
+      <div class="dropdown">
+        <button class="btn btn-outline dropdown-toggle" type="button" data-toggle="dropdown">
+          Repository
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <li><a href="" ng-click="setRepository('core');">Core</a></li>
+          <li><a href="" ng-click="setRepository('community');">Community</a></li>
+        </ul>
       </div>
 
-      <button class="btn" type="button" ng-click="showCategory('');" ng-class="{ 'btn-primary': '' === category }">{{ 'appstore.category.all' | tr }}</button>
-      <button class="btn" type="button" ng-click="showCategory('new');" ng-class="{ 'btn-primary': 'new' === category }">{{ 'appstore.category.newApps' | tr }}</button>
       <div class="dropdown">
         <button class="btn dropdown-toggle" type="button" data-toggle="dropdown" ng-class="{ 'btn-primary': '' !== category && 'recent' !== category && 'new' !== category }">
           {{ categoryButtonLabel(category) }}
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
+          <li><a href="" ng-click="showCategory('');"><i class="fas fa-home fa-fw"></i> {{ 'appstore.category.all' | tr }}</a></li>
+          <li><a href="" ng-click="showCategory('new');"><i class="fas fa-rss fa-fw"></i> {{ 'appstore.category.newApps' | tr }}</a></li>
+          <li role="separator" class="divider"></li>
           <li ng-repeat="category in categories | orderBy:'label'"><a href="" ng-click="showCategory(category.id);"><i class="{{ category.icon }} fa-fw"></i> {{ category.label }}</a></li>
         </ul>
       </div>
@@ -384,16 +391,12 @@
       <div class="btn-group">
         <button type="button" class="btn btn-default" ng-click="openAppProxy()"><i class="fas fa-exchange-alt"></i> {{ 'apps.addAppproxyAction' | tr }}</a></a>
         <button type="button" class="btn btn-default" ng-click="applinksAdd.show()"><i class="fas fa-link"></i> {{ 'apps.addApplinkAction' | tr }}</button>
-        <!-- <ul class="dropdown-menu">
-          <li><a href="" ng-click="applinksAdd.show()"><i class="fas fa-link fa-fw"></i> {{ 'apps.addApplinkAction' | tr }}</a></li>
-          <li><a href="/#/appstore/io.cloudron.builtin.appproxy"><i class="fas fa-exchange-alt fa-fw"></i> {{ 'apps.addAppproxyAction' | tr }}</a></li>
-        </ul> -->
       </div>
     </div>
   </div>
 
   <div ng-show="ready && validSubscription" class="ng-cloak appstore-grid">
-    <div class="text-center" ng-hide="apps.length">
+    <div class="text-center" ng-hide="apps.length || popularApps.length">
       <br/>
       <br/>
       <br/>
@@ -404,7 +407,7 @@
     <div class="" ng-show="category === '' && popularApps.length">
       <div class="row-no-margin">
         <div class="col-sm-12">
-          <h2>{{ 'appstore.category.popular' | tr }}</h2>
+          <h2>{{ 'appstore.category.popular' | tr }} ({{ repository }})</h2>
         </div>
       </div>
       <div class="row-no-margin">
@@ -425,7 +428,7 @@
     <div class="" ng-show="apps.length">
       <div class="row-no-margin" ng-show="!category && !searchString">
         <div class="col-sm-12">
-          <h2>{{ 'appstore.category.all' | tr }}</h2>
+          <h2>{{ 'appstore.category.all' | tr }} ({{ repository }})</h2>
         </div>
       </div>
       <div class="row-no-margin">
diff --git a/src/views/appstore.js b/src/views/appstore.js
index ec4fb7db2..2b76cc174 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -33,7 +33,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
     $scope.setRepository = function (repository) {
         $scope.repository = repository;
 
-        Client.getAppstoreApps(repository);
+        $scope.showCategory($scope.category);
     };
 
     $scope.showView = function (view) {
@@ -86,8 +86,8 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
     $scope.categoryButtonLabel = function (category) {
         var categoryLabel = $translate.instant('appstore.categoryLabel');
 
-        if (category === 'new') return categoryLabel;
-        if (category === 'recent') return categoryLabel;
+        if (category === '') return $translate.instant('appstore.category.all');
+        if (category === 'new') return $translate.instant('appstore.category.newApps');
 
         var tmp = $scope.categories.find(function (c) { return c.id === category; });
         if (tmp) return tmp.label;