diff --git a/core/lib/Thelia/Controller/Admin/FolderController.php b/core/lib/Thelia/Controller/Admin/FolderController.php
index 4575035da..510180ddf 100644
--- a/core/lib/Thelia/Controller/Admin/FolderController.php
+++ b/core/lib/Thelia/Controller/Admin/FolderController.php
@@ -23,6 +23,8 @@
 
 namespace Thelia\Controller\Admin;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Form\FolderModificationForm;
+use Thelia\Model\FolderQuery;
 
 /**
  * Class FolderController
@@ -71,11 +73,25 @@ class FolderController extends AbstractCrudController
     /**
      * Hydrate the update form for this object, before passing it to the update template
      *
-     * @param unknown $object
+     * @param \Thelia\Model\Folder $object
      */
-    protected function hydrateObjectForm($object)
-    {
-        // TODO: Implement hydrateObjectForm() method.
+    protected function hydrateObjectForm($object) {
+
+        // Prepare the data that will hydrate the form
+        $data = array(
+            'id'           => $object->getId(),
+            'locale'       => $object->getLocale(),
+            'title'        => $object->getTitle(),
+            'chapo'        => $object->getChapo(),
+            'description'  => $object->getDescription(),
+            'postscriptum' => $object->getPostscriptum(),
+            'visible'      => $object->getVisible(),
+            'url'          => $object->getRewrittenUrl($this->getCurrentEditionLocale()),
+            'parent'       => $object->getParent()
+        );
+
+        // Setup the object form
+        return new FolderModificationForm($this->getRequest(), "form", $data);
     }
 
     /**
@@ -129,9 +145,10 @@ class FolderController extends AbstractCrudController
     /**
      * Load an existing object from the database
      */
-    protected function getExistingObject()
-    {
-        // TODO: Implement getExistingObject() method.
+    protected function getExistingObject() {
+        return FolderQuery::create()
+            ->joinWithI18n($this->getCurrentEditionLocale())
+            ->findOneById($this->getRequest()->get('folder_id', 0));
     }
 
     /**
diff --git a/templates/admin/default/folders.html b/templates/admin/default/folders.html
index 99b6d8e39..4cb4eca12 100644
--- a/templates/admin/default/folders.html
+++ b/templates/admin/default/folders.html
@@ -114,9 +114,6 @@
                                       </a>
                                  </td>
 
-                             <td class="actions">
-                                 <div class="btn-group">
-                                     <a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folders' folder_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
                                  {module_include location='folder_list_row'}
 
                                  <td>