diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 27bbd1be9..cbdb3ea13 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -15,7 +15,7 @@ class Hm_Output_search_from_folder_list extends Hm_Output_Module {
      * Add a search form to the top of the folder list
      */
     protected function output() {
-        $res = '<li class="menu_search mb-4"><form method="get">';
+        $res = '<li class="menu_search mb-2"><form method="get">';
         $res .= '<div class="input-group">';
         if (!$this->get('hide_folder_icons')) {
             $res .= '<a href="?page=search" class="input-group-text" id="basic-addon1">' . 
diff --git a/modules/core/site.css b/modules/core/site.css
index 705073b91..176ea7b16 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -382,6 +382,7 @@ button {
 }
 .inner_list {
   margin-bottom: 10px;
+  margin-top: 5px;
 }
 .folders a,
 .unread_link,.all_tags {
@@ -415,9 +416,11 @@ button {
   padding: 0.5rem;
   border-radius: var(--bs-border-radius);
   transition: all linear 0.3s;
-  margin-bottom: 10px;
   position: relative;
 }
+.folders li a {
+  display: block;
+}
 .inner_list li {
   margin: 2px;
   white-space: nowrap;
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 7dad73221..ddc00f994 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -535,15 +535,13 @@
 .fade-in {
   animation-name: fadeIn;
 }
-li[class^="imap_"] .inner_list li[class^="imap_"] {
-    /* display: flex;
-    align-items: center; */
+li[class^="imap_"] .inner_list li[class^="imap_"], li.manage_folders_li {
     position: relative;
     display: flex;
     align-items: center;
     border-radius: 4px;
-    margin: 2px 0;
     transition: background-color .3s;
+    padding: 5px 7px;
 }
 .inner_list li[class^="imap_"] #main-link {
     flex-grow: 1;
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
index cb7260dcf..4d2317be8 100644
--- a/tests/phpunit/modules/core/output_modules.php
+++ b/tests/phpunit/modules/core/output_modules.php
@@ -18,7 +18,7 @@ public function test_search_from_folder_list() {
         $test->run();
         $test->rtype = 'AJAX';
         $res = $test->run();
-        $this->assertEquals('<li class="menu_search mb-4"><form method="get"><div class="input-group"><a href="?page=search" class="input-group-text" id="basic-addon1"><i class="bi bi-search"></i></a><input type="hidden" name="page" value="search" /><input type="search" class="search_terms form-control form-control-sm" aria-describedby="basic-addon1" name="search_terms" placeholder="Search" /></div></form></li>', $res->output_data['formatted_folder_list']);
+        $this->assertEquals('<li class="menu_search mb-2"><form method="get"><div class="input-group"><a href="?page=search" class="input-group-text" id="basic-addon1"><i class="bi bi-search"></i></a><input type="hidden" name="page" value="search" /><input type="search" class="search_terms form-control form-control-sm" aria-describedby="basic-addon1" name="search_terms" placeholder="Search" /></div></form></li>', $res->output_data['formatted_folder_list']);
     }
     /**
      * @preserveGlobalState disabled