diff --git a/modules/backend/widgets/toolbar/partials/_toolbar.php b/modules/backend/widgets/toolbar/partials/_toolbar.php
index bf43b9d710..662a478820 100644
--- a/modules/backend/widgets/toolbar/partials/_toolbar.php
+++ b/modules/backend/widgets/toolbar/partials/_toolbar.php
@@ -1,17 +1,21 @@
+<?php if ($controlPanel || $search): ?>
 <div class="toolbar-widget <?= $cssClasses ?>" id="<?= $this->getId() ?>">
     <div class="control-toolbar">
 
+    <?php if ($controlPanel): ?>
         <!-- Control Panel -->
         <div class="toolbar-item toolbar-primary">
-            <?= ($controlPanel) ?: '&nbsp;' ?>
+            <?= ($controlPanel) ?>
         </div>
+    <?php endif ?>
 
+    <?php if ($search): ?>
         <!-- List Search -->
-        <?php if ($search): ?>
-            <div class="toolbar-item" data-calculate-width>
-                <?= $search ?>
-            </div>
-        <?php endif ?>
+        <div class="toolbar-item" data-calculate-width>
+            <?= $search ?>
+        </div>
+    <?php endif ?>
 
     </div>
-</div>
\ No newline at end of file
+</div>
+<?php endif ?>