diff --git a/src/js/client.js b/src/js/client.js
index 66c29ce03..c6fa16e29 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -3326,10 +3326,13 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         else this._fetchingAppstoreAppsListener.push(callback);
     };
 
-    Client.prototype.getAppstoreApps = function (callback) {
+    Client.prototype.getAppstoreApps = function (repository, callback) {
         var that = this;
 
-        get('/api/v1/appstore/apps', null, function (error, data, status) {
+        callback = callback || function () {};
+        repository = repository || 'core';
+
+        get('/api/v1/appstore/apps?repository=' + repository, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
@@ -3339,10 +3342,12 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.getAppstoreAppsFast = function (callback) {
+    Client.prototype.getAppstoreAppsFast = function (repository, callback) {
         if (this._appstoreAppCache.length !== 0) return callback(null, this._appstoreAppCache);
 
-        this.getAppstoreApps(callback);
+        repository = repository || 'core';
+
+        this.getAppstoreApps(repository, callback);
     };
 
     Client.prototype.getSubscription = function (callback) {
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 6903c21e6..cc8744632 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -354,6 +354,11 @@
 
   <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>
+
       <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">
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 1dc2e0558..ec4fb7db2 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -28,6 +28,13 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
     $scope.unstableApps = false;
     $scope.subscription = {};
     $scope.memory = null; // { memory, swap }
+    $scope.repository = 'core'; // core or community
+
+    $scope.setRepository = function (repository) {
+        $scope.repository = repository;
+
+        Client.getAppstoreApps(repository);
+    };
 
     $scope.showView = function (view) {
         // wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
@@ -476,7 +483,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
 
         $scope.category = '';
 
-        Client.getAppstoreAppsFast(function (error, apps) {
+        Client.getAppstoreAppsFast($scope.repository, function (error, apps) {
             if (error) return $timeout($scope.search, 1000);
 
             var token = $scope.searchString.toUpperCase();
@@ -533,7 +540,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
 
         $scope.cachedCategory = $scope.category;
 
-        Client.getAppstoreAppsFast(function (error, apps) {
+        Client.getAppstoreAppsFast($scope.repository, function (error, apps) {
             if (error) return $timeout($scope.showCategory.bind(null, category), 1000);
 
             if (!$scope.category) {
@@ -759,7 +766,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
     }
 
     function init() {
-        Client.getAppstoreAppsFast(function (error) {
+        Client.getAppstoreAppsFast($scope.repository, function (error) {
             if (error && error.statusCode === 402) {
                 $scope.validSubscription = false;
                 $scope.ready = true;
@@ -780,7 +787,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
 
 
                 // refresh everything in background
-                Client.getAppstoreApps(function (error) { if (error) console.error('Failed to fetch apps.', error); });
+                Client.getAppstoreApps($scope.repository, function (error) { if (error) console.error('Failed to fetch apps.', error); });
                 Client.refreshConfig(); // refresh domain, user, group limit etc
                 fetchUsers();
                 fetchGroups();