diff --git a/modules/cms/widgets/componentlist/partials/_toolbar.htm b/modules/cms/widgets/componentlist/partials/_toolbar.htm
index df06c51c8..66c1ef7bb 100644
--- a/modules/cms/widgets/componentlist/partials/_toolbar.htm
+++ b/modules/cms/widgets/componentlist/partials/_toolbar.htm
@@ -1,15 +1,16 @@
 <div class="layout-row min-size">
-    <div class="layout control-toolbar">
-        <div class="layout-cell">
-            <div class="relative toolbar-item loading-indicator-container size-input-text">
-                <input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
-                    class="form-control icon search" autocomplete="off"
-                    data-track-input
-                    data-load-indicator
-                    data-load-indicator-opaque
-                    data-request="<?= $this->getEventHandler('onSearch') ?>"
-                />
-            </div>
+    <div class="control-toolbar toolbar-padded">
+
+        <!-- Component Search -->
+        <div class="relative toolbar-item loading-indicator-container size-input-text">
+            <input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
+                class="form-control icon search" autocomplete="off"
+                data-track-input
+                data-load-indicator
+                data-load-indicator-opaque
+                data-request="<?= $this->getEventHandler('onSearch') ?>"
+            />
         </div>
+
     </div>
-</div>
\ No newline at end of file
+</div>