diff --git a/src/theme.scss b/src/theme.scss
index 5a3546311..08f6aef7b 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1280,6 +1280,18 @@ footer {
     white-space: nowrap;
 }
 
+.users-filter {
+    display: inline-block;
+    padding-left: 0;
+    margin: 20px 0;
+    border-radius: 2px;
+
+    .form-control {
+        display: inline-block;
+        width: 200px;
+    }
+}
+
 // ----------------------------
 // Upgrade
 // ----------------------------
diff --git a/src/views/users.html b/src/views/users.html
index e266455e4..692fbf1ef 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -356,7 +356,7 @@
 
   <div class="row">
     <div class="col-lg-12">
-      <div class="filter">
+      <div class="users-filter">
         <input type="text" class="form-control" style="min-width: 350px;" ng-model="userSearchString" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="Search"/>
         <select class="form-control" ng-model="pageItems" ng-options="a.name for a in pageItemCount" ng-change="updateFilter(true)"></select>
       </div>