diff --git a/dashboard/public/views/apps.html b/dashboard/public/views/apps.html
index 60ca8de83..c43c75e6c 100644
--- a/dashboard/public/views/apps.html
+++ b/dashboard/public/views/apps.html
@@ -141,12 +141,12 @@
       <div class="view-header-search-bar">
         <form class="form-inline">
           <div class="input-group">
-            <input type="text" class="form-control" style="width: 300px" placeholder="{{ 'apps.searchPlaceholder' | tr }} ( / )" id="appSearch" ng-model="appSearch"/>
+            <input type="text" class="form-control" 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="toggleFilter()"><i class="fas fa-filter"></i></button>
             </span>
           </div>
-          <button class="btn btn-default" type="button" ng-click="toggleView()"><i class="fas" ng-class="{ 'fa-list': view === VIEWS.GRID, 'fa-grip': view === VIEWS.LIST }"></i></button>
+          <button class="btn btn-default" style="margin-left: 10px;" type="button" ng-click="toggleView()"><i class="fas" ng-class="{ 'fa-list': view === VIEWS.GRID, 'fa-grip': view === VIEWS.LIST }"></i></button>
         </form>
       </div>
     </h1>
diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss
index 228e0850a..a7702c659 100644
--- a/dashboard/src/theme.scss
+++ b/dashboard/src/theme.scss
@@ -184,13 +184,25 @@ html, body {
 }
 
 .view-header-filter-bar {
-    text-align: right;
+    padding-right: 20px;
+    padding-left: 15px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+}
+
+@media(min-width:768px) {
+    .view-header-filter-bar {
+        justify-content: right;
+    }
 }
 
 .view-header-search-bar {
-    .input-group {
-        display: inline-block;
-        vertical-align: middle;
+    margin-top: 10px;
+
+    form {
+        display: flex;
+        justify-content: space-between;
     }
 
     @media(min-width:768px) {