diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index e1c7a5676..0530cc420 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -44,6 +44,11 @@
         <requirement key="parentType">.*</requirement>
         <requirement key="parentId">\d+</requirement>
     </route>
+    <route id="admin.image.form-ajax" path="/admin/image/type/{parentType}/{parentId}/form-ajax">
+        <default key="_controller">Thelia\Controller\Admin\FileController::getImageFormAjaxAction</default>
+        <requirement key="parentType">.*</requirement>
+        <requirement key="parentId">\d+</requirement>
+    </route>
     <route id="admin.image.list-ajax" path="/admin/image/type/{parentType}/{parentId}/list-ajax">
         <default key="_controller">Thelia\Controller\Admin\FileController::getImageListAjaxAction</default>
         <requirement key="parentType">.*</requirement>
diff --git a/core/lib/Thelia/Controller/Admin/FileController.php b/core/lib/Thelia/Controller/Admin/FileController.php
index 2592db192..1b2e3b21b 100755
--- a/core/lib/Thelia/Controller/Admin/FileController.php
+++ b/core/lib/Thelia/Controller/Admin/FileController.php
@@ -138,6 +138,23 @@ class FileController extends BaseAdminController
         return $this->render('includes/image-upload-list-ajax', $args);
     }
 
+    /**
+     * Manage how an image list will be uploaded in AJAX
+     *
+     * @param int    $parentId   Parent id owning images being saved
+     * @param string $parentType Parent Type owning images being saved
+     *
+     * @return Response
+     */
+    public function getImageFormAjaxAction($parentId, $parentType)
+    {
+        $this->checkAuth('ADMIN', 'admin.image.save');
+        $this->checkXmlHttpRequest();
+        $args = array('imageType' => $parentType, 'parentId' => $parentId);
+
+        return $this->render('includes/image-upload-form', $args);
+    }
+
     /**
      * Manage how an image is viewed
      *
diff --git a/core/lib/Thelia/Tools/FileManager.php b/core/lib/Thelia/Tools/FileManager.php
index 4b1d90e89..6b37bfb30 100644
--- a/core/lib/Thelia/Tools/FileManager.php
+++ b/core/lib/Thelia/Tools/FileManager.php
@@ -413,7 +413,7 @@ class FileManager
                 $uri = '/admin/content/update/' . $parentId;
                 break;
             case ImagesCreateOrUpdateEvent::TYPE_FOLDER:
-                $uri = '/admin/folders/update?folder_id=' . $parentId;
+                $uri = '/admin/folders/update/' . $parentId;
                 break;
             default:
                 $uri = false;
diff --git a/templates/admin/default/product-edit.html b/templates/admin/default/product-edit.html
index d9cda2f8d..e7dfd50ef 100644
--- a/templates/admin/default/product-edit.html
+++ b/templates/admin/default/product-edit.html
@@ -62,7 +62,13 @@
                                    data-toggle="tab">{intl l="Associations"}</a>
                             </li>
 
-		                    <li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
+		                    <li>
+                                <a href="#images"
+                                   data-toggle="tab"
+                                   data-href="{url path="/admin/image/type/product/{$product_id}/form-ajax"}">
+                                    {intl l="Images"}
+                                </a>
+                            </li>
 		                    <li><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
 		                    <li><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
 		 				</ul>