diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 60205eaaa..eb6b443a0 100644
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -157,6 +157,9 @@ body.flexbox {
 .justify-center {
   justify-content: center;
 }
+.justify-space-between {
+  justify-content: space-between;
+}
 .items-center {
   align-items: center;
 }
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 6bc229ec6..5eef51175 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -9,11 +9,11 @@
 
         <main class="card content-wrap">
 
-            <div class="grid right-focus v-center">
+            <div class="flex-container-row wrap justify-space-between items-center">
                 <h1 class="list-heading">{{ trans('settings.users') }}</h1>
 
-                <div class="text-right">
-                    <div class="block inline mr-s">
+                <div>
+                    <div class="block inline mr-xs">
                         <form method="get" action="{{ url("/settings/users") }}">
                             @foreach(collect($listDetails)->except('search') as $name => $val)
                                 <input type="hidden" name="{{ $name }}" value="{{ $val }}">