diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index cf0645633..b4e27d8a6 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -5,16 +5,14 @@ use Icinga\Data\Reducible;
 
 if (! $this->compact): ?>
 <div class="controls separated">
-    <?= $tabs; ?>
-    <div class="grid">
-        <?= $this->sortBox ?>
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
         <?= $this->limiter ?>
-        <?= $this->paginator ?>
-    </div>
-    <div>
-        <?= $this->backendSelection; ?>
-        <?= $this->filterEditor; ?>
+        <?= $this->sortBox ?>
     </div>
+    <?= $this->backendSelection ?>
+    <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
 <div class="content">
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 182e26e87..7e045d8a9 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -5,16 +5,14 @@ use Icinga\Data\Reducible;
 
 if (! $this->compact): ?>
 <div class="controls separated">
-    <?= $tabs ?>
-    <div class="grid">
-        <?= $this->sortBox ?>
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
         <?= $this->limiter ?>
-        <?= $this->paginator ?>
-    </div>
-    <div>
-        <?= $this->backendSelection ?>
-        <?= $this->filterEditor ?>
+        <?= $this->sortBox ?>
     </div>
+    <?= $this->backendSelection ?>
+    <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
 <div class="content">