diff --git a/src/theme.scss b/src/theme.scss
index a58b6f7ab..ad9e10e88 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -168,7 +168,7 @@ html, body {
     padding: 0;
 }
 
-.filter-bar {
+.view-header-filter-bar {
     position: absolute;
     right: 14px;
     margin-top: 5px;
@@ -181,6 +181,17 @@ html, body {
     box-shadow: 0 6px 12px rgba(0,0,0,.175);
 }
 
+.view-header-search-bar {
+    .input-group {
+        display: inline-block;
+        vertical-align: middle;
+    }
+
+    @media(min-width:768px) {
+        float: right;
+    }
+}
+
 .offline-banner {
     position: fixed;
     z-index: 30000;
@@ -2060,6 +2071,10 @@ tag-input {
         background-color: $backgroundLight;
     }
 
+    .view-header-filter-bar {
+        background-color: $backgroundLight;
+    }
+
     .appstore-toolbar {
         color: $textColor;
     }
diff --git a/src/views/apps.html b/src/views/apps.html
index 90a1b1fac..176d3cb87 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -194,7 +194,7 @@
     <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
       <h1 class="view-header">
         {{ 'apps.title' | tr }}
-        <div class="pull-right">
+        <div class="view-header-search-bar">
           <form class="form-inline">
             <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"/>
@@ -212,7 +212,7 @@
             </div>
           </form>
         </div>
-        <div ng-show="showFilter" class="filter-bar">
+        <div ng-show="showFilter" class="view-header-filter-bar">
           <form class="form-inline">
             <button class="btn btn-primary" ng-show="selectedTags.length || selectedState.state || !selectedGroup._unset || !selectedDomain._alldomains" ng-click="clearAllFilter()">{{ 'apps.filter.clearAll' | tr }</button>
             <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>