diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index a2e7502ea3..6fb6db63ec 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -1,28 +1,28 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Service;
 
-?>
-<?php if (!$this->compact): ?>
+if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl; ?>
-  </div>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content" data-base-target="_next">
-  <table class="pivot servicestates">
 <?php
+
 $hasHeader = false;
 $pivotData = $this->pivot->toArray();
+if (count($pivotData) === 0) {
+    echo $this->translate('No services found matching the filter') . '</div>';
+    return;
+}
+
 $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . ')';
 ?>
-
-<?php if (count($pivotData) === 0): ?>
-    <?= $this->translate('No Services matching the filter'); ?>
-<?php endif ?>
-
+  <table class="pivot servicestates">
 <?php foreach ($pivotData as $host_name => $serviceStates): ?>
 <?php if (!$hasHeader): ?>
     <thead>