diff --git a/src/views/apps.html b/src/views/apps.html
index d28dd83e8..16e6cd19f 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -194,17 +194,26 @@
     <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
       <h1 class="view-header">
         {{ 'apps.title' | tr }}
-        <div class="btn-group">
-          <button type="button" class="btn btn-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-plus"></i></button>
-          <ul class="dropdown-menu">
-            <li><a href="/#/appstore"><i class="fa fa-cloud-download-alt fa-fw"></i> {{ 'apps.addAppAction' | tr }}</a></li>
-            <li><a href="/#/appstore/io.cloudron.builtin.appproxy?version=0.1.0"><i class="fas fa-map-signs fa-fw"></i> {{ 'apps.addAppproxyAction' | tr }}</a></li>
-            <li><a href="" ng-click="applinksAdd.show()"><i class="fas fa-link fa-fw"></i> {{ 'apps.addApplinkAction' | tr }}</a></li>
-          </ul>
-        </div>
         <div class="pull-right">
           <form class="form-inline">
-            <input type="text" class="form-control" ng-show="installedApps.length > 8" placeholder="{{ 'apps.searchPlaceholder' | tr }}" id="appSearch" ng-model="appSearch"/>
+            <div class="input-group">
+              <input type="text" class="form-control" style="width: 300px" ng-show="installedApps.length > 8" placeholder="{{ 'apps.searchPlaceholder' | tr }}" id="appSearch" ng-model="appSearch"/>
+              <span class="input-group-btn">
+                <button class="btn btn-default" type="button" ng-class="{ 'active': showFilter }" ng-click="showFilter = !showFilter">{{ showFilter ? 'Less' : 'More' }} Filter</button>
+              </span>
+            </div>
+            <div class="btn-group">
+              <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-plus"></i> Add</button>
+              <ul class="dropdown-menu">
+                <li><a href="/#/appstore"><i class="fa fa-cloud-download-alt fa-fw"></i> {{ 'apps.addAppAction' | tr }}</a></li>
+                <li><a href="/#/appstore/io.cloudron.builtin.appproxy?version=0.1.0"><i class="fas fa-map-signs fa-fw"></i> {{ 'apps.addAppproxyAction' | tr }}</a></li>
+                <li><a href="" ng-click="applinksAdd.show()"><i class="fas fa-link fa-fw"></i> {{ 'apps.addApplinkAction' | tr }}</a></li>
+              </ul>
+            </div>
+          </form>
+        </div>
+        <div ng-show="showFilter" class="pull-right">
+          <form class="form-inline">
             <multiselect ng-model="selectedGroup" ng-show="user.isAtLeastAdmin && installedApps.length > 1 && groups.length > 1" ms-header="{{ selectedGroup.name }}" options="group.name for group in groups" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
             <multiselect ng-model="selectedState" ng-show="user.isAtLeastAdmin && installedApps.length > 1" ms-header="{{ 'apps.stateFilterHeader' | tr }}" ms-selected="{{ selectedState }}" options="state.label for state in states" data-multiple="false"></multiselect>
             <multiselect ng-model="selectedTags" ng-show="user.isAtLeastAdmin && tags.length > 0" ms-header="{{ 'apps.tagsFilterHeaderAll' | tr }}" ms-selected="{{ 'apps.tagsFilterHeader' | tr:{ tags: selectedTags.join(', ') } }}" options="tag for tag in tags" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
diff --git a/src/views/apps.js b/src/views/apps.js
index f1605fbf1..35ec28038 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -28,6 +28,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$translat
     $scope.appSearch = '';
     $scope.groups = [ GROUP_ACCESS_UNSET ];
     $scope.APP_TYPES = APP_TYPES;
+    $scope.showFilter = false;
 
     $scope.allUsers = [];
     $scope.allGroups = [];