diff --git a/modoboa/extensions/admin/templates/admin/listing.html b/modoboa/extensions/admin/templates/admin/listing.html
index a4fd2a29e..c08435d2b 100644
--- a/modoboa/extensions/admin/templates/admin/listing.html
+++ b/modoboa/extensions/admin/templates/admin/listing.html
@@ -14,8 +14,6 @@ var admin;
       <div class="side-bar-responsive">
         <li class="nav-header">{% trans "Filter" %}</li>
         <li>{% include "admin/searchform.html" %}</li>
-      </div>
-      <div class="side-bar-responsive">
         <li id="taglist"></li>
         <li class="nav-header">{% trans "Actions" %}</li>
         {% block actions %}{% endblock %}
diff --git a/modoboa/extensions/admin/templates/admin/searchform.html b/modoboa/extensions/admin/templates/admin/searchform.html
index 96dd83e47..1246ca0c0 100644
--- a/modoboa/extensions/admin/templates/admin/searchform.html
+++ b/modoboa/extensions/admin/templates/admin/searchform.html
@@ -1,8 +1,8 @@
 {% load i18n %}
-<form id="searchform" class="form-horizontal">
-  <div class="input-prepend input-append">
-    <span class="add-on"><i class="icon-search"></i></span>
-    <input class="span10" type="text"
+<form id="searchform">
+  <div class="input-group">
+    <span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span>
+    <input class="form-control" type="text"
            value={% if squery %}"{{ squery }}"{% else %}"{% trans 'Search' %}"{% endif %}
            id="searchquery" name="searchquery" />
   </div>
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index 572dce006..9c45ba955 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -43,9 +43,15 @@ h5{
     font-size:15px;
     font-weight: bold;
 }
+
 label{
     font-weight: normal;
 }
+
+div.input-group{
+    margin-bottom:8px;
+}
+
 /* end Global*/
 
 #fixed_content {
@@ -56,7 +62,6 @@ label{
     overflow: hidden;
 }
 
-
 .form-horizontal .param-label {
     float: left;
     padding-top: 5px;