diff --git a/core/lib/Thelia/Core/Template/Loop/Folder.php b/core/lib/Thelia/Core/Template/Loop/Folder.php
index 7b6906e32..618c411e3 100644
--- a/core/lib/Thelia/Core/Template/Loop/Folder.php
+++ b/core/lib/Thelia/Core/Template/Loop/Folder.php
@@ -18,6 +18,7 @@ use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Element\PropelSearchLoopInterface;
+use Thelia\Core\Template\Element\SearchLoopInterface;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
@@ -33,7 +34,7 @@ use Thelia\Type\BooleanOrBothType;
  * @package Thelia\Core\Template\Loop
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
  */
-class Folder extends BaseI18nLoop implements PropelSearchLoopInterface
+class Folder extends BaseI18nLoop implements PropelSearchLoopInterface, SearchLoopInterface
 {
     protected $timestampable = true;
     protected $versionable = true;
@@ -62,6 +63,23 @@ class Folder extends BaseI18nLoop implements PropelSearchLoopInterface
         );
     }
 
+    /**
+     * @return array of available field to search in
+     */
+    public function getSearchIn()
+    {
+        return [
+            "title"
+        ];
+    }
+
+    public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria)
+    {
+        $search->_and();
+
+        $search->where("CASE WHEN NOT ISNULL(`requested_locale_i18n`.ID) THEN `requested_locale_i18n`.`TITLE` ELSE `default_locale_i18n`.`TITLE` END ".$searchCriteria." ?", $searchTerm, \PDO::PARAM_STR);
+    }
+
     public function buildModelCriteria()
     {
         $search = FolderQuery::create();
diff --git a/templates/backOffice/default/search.html b/templates/backOffice/default/search.html
index 079ae1b69..626a0a771 100644
--- a/templates/backOffice/default/search.html
+++ b/templates/backOffice/default/search.html
@@ -260,6 +260,49 @@
                 </div>
                 {* end product search *}
 
+                {* folder search *}
+                <div class="general-block-decorator">
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed table-left-aligned">
+                            <caption class="clearfix">
+                                {intl l='Folder'}
+                            </caption>
+                            <thead>
+                            <tr>
+                                <th>{intl l="ID"}</th>
+                                <th></th>
+                                <th>{intl l="Folder title"}</th>
+
+                                <th class="actions">{intl l="Actions"}</th>
+                            </tr>
+                            </thead>
+
+                            <tbody>
+                            {loop type="folder" name="folder-search" visible="*" search_mode="sentence" search_term=trim($smarty.get.search_term) search_in="title"}
+
+                                <tr>
+                                    <td>{$ID}</td>
+                                    <td></td>
+
+                                    <td class="object-title"><a href="{url path="/admin/folders/update/{$ID}"}">{$TITLE}</a></td>
+
+
+                                    <td class="actions">
+                                        <div class="btn-group">
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.folder" access="UPDATE"}
+                                                <a class="btn btn-default btn-xs" title="{intl l='Edit this product'}" href="{url path='/admin/products/update' product_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>
+
+                            {/loop}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                {* end folder search *}
+
             </div>
         </div>