diff --git a/application/views/scripts/objects/table.phtml b/application/views/scripts/objects/table.phtml
index 3a05234b..1f649c7f 100644
--- a/application/views/scripts/objects/table.phtml
+++ b/application/views/scripts/objects/table.phtml
@@ -4,10 +4,14 @@
 <span data-base-target="_next">
 <?= $this->addLink ?>
 </span>
+<?php if (count($table) || ! $this->filterEditor->getFilter()->isEmpty()): ?>
 <?= $this->filterEditor ?>
+<?php endif ?>
 <?= $this->table->getPaginator() ?>
 </div>
 
 <div class="content" data-base-target="_next">
+<?php if (count($table)): ?>
 <?= $this->table->render() ?>
+<?php endif ?>
 </div>