diff --git a/templates/admin/default/content-edit.html b/templates/admin/default/content-edit.html
index 994cbd994..0a0353e0b 100644
--- a/templates/admin/default/content-edit.html
+++ b/templates/admin/default/content-edit.html
@@ -142,108 +142,7 @@
         </div>
 
         <div class="tab-pane fade" id="association">
-            <div class="form-container">
-                <div class="row">
-                    {* -- Begin folders management ----------------------------------- *}
-                    <div class="col-md-6">
-                        <div class="well well-sm">
-                            <div class="form-group">
-                                <form method="POST" action="{url path='/admin/products/category/add'}" id="related_content_form">
-
-                                    <p class="title title-without-tabs">{intl l='Additional categories'}</p>
-                                    <p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'}
-                                        {loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
-                                        {intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}
-                                        {/loop}
-
-                                        {$exclude_from_tree = "-1"}
-                                        {loop name="additional_folders" type="folder" exclude=$DEFAULT_FOLDER content=$content_id backend_context="1" lang="$edit_language_id"}
-                                        {$exclude_from_tree = "$exclude_from_tree,$ID"}
-                                        {/loop}
-                                        <input type="hidden" name="content_id" value="{$content_id}" />
-                                        <input type="hidden" name="current_tab" value="association" />
-
-                                        {ifloop rel="folders"}
-                                    <div class="input-group">
-
-                                        <select name="additional_category_id" id="accessory_category_id" class="form-control">
-                                            <option value="">{intl l='Select a folder...'}</option>
-                                            {loop name="folders" type="folder-tree" folder="0" exclude=$exclude_from_tree backend_context="1" lang="$edit_language_id"}
-                                                <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $DEFAULT_FOLDER==$ID}disabled="disabled"{/if}>
-                                                    {$TITLE} {if $DEFAULT_FOLDER==$ID}{intl l=' (default)'}{/if}
-                                                </option>
-                                            {/loop}
-                                        </select>
-
-                                    <span class="input-group-btn" id="content_add_button">
-                                       <button class="btn btn-default btn-primary action-btn" type="submit"><span class="glyphicon glyphicon-plus-sign"></span></button>
-                                    </span>
-
-                                    </div>
-                                    <span class="help-block">{intl l='Select a folder and click (+) to add it to the additional folder list'}</span>
-                                    {/ifloop}
-
-                                    {elseloop rel="folders"}
-                                        <div class="alert alert-info">{intl l="No Folders found"}</div>
-                                    {/elseloop}
-
-                                </form>
-                            </div>
-
-                            <div class="table-responsive">
-                                <table class="table table-striped table-condensed table-left-aligned">
-                                    <thead>
-                                    <tr>
-                                        <th>{intl l='ID'}</th>
-
-                                        <th>{intl l='Folder title'}</th>
-
-                                        {module_include location='product_folders_table_header'}
-
-                                        <th class="actions">{intl l="Actions"}</th>
-                                    </tr>
-                                    </thead>
-
-                                    <tbody>
-                                    {loop name="additional_folders" type="folder" content=$content_id exclude=$DEFAULT_FOLDER backend_context="1" lang="$edit_language_id"}
-                                        <tr>
-                                            <td>{$ID}</td>
-
-                                            <td>
-                                                {$TITLE}
-                                            </td>
-
-                                            {module_include location='product_folders_table_row'}
-
-                                            <td class="actions">
-                                                <div class="btn-group">
-                                                    {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.category.delete"}
-                                                        <a class="btn btn-default btn-xs delete-category" title="{intl l='Remove the product from this category'}" href="#delete_category_dialog" data-id="{$ID}" data-toggle="modal">
-                                                            <span class="glyphicon glyphicon-trash"></span>
-                                                        </a>
-                                                    {/loop}
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    {/loop}
-
-                                    {elseloop rel="additional_folders"}
-                                        <tr>
-                                            <td colspan="3">
-                                                <div class="alert alert-info">
-                                                    {intl l="This product doesn't belong to any additional folder."}
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    {/elseloop}
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                    {* -- End folders management ------------------------------------- *}
-                </div>
-            </div>
+            {include file="includes/content-folder-management.html"}
         </div>
 
         <div class="tab-pane fade" id="images">
diff --git a/templates/admin/default/includes/content-folder-management.html b/templates/admin/default/includes/content-folder-management.html
new file mode 100644
index 000000000..04bcd5a4a
--- /dev/null
+++ b/templates/admin/default/includes/content-folder-management.html
@@ -0,0 +1,102 @@
+<div class="form-container">
+    <div class="row">
+        {* -- Begin folders management ----------------------------------- *}
+        <div class="col-md-6">
+            <div class="well well-sm">
+                <div class="form-group">
+                    <form method="POST" action="{url path='/admin/products/category/add'}" id="related_content_form">
+
+                        <p class="title title-without-tabs">{intl l='Additional categories'}</p>
+                        <p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'}
+                            {loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
+                            {intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}
+                            {/loop}
+
+                            {$exclude_from_tree = "-1"}
+                            {loop name="additional_folders" type="folder" exclude=$DEFAULT_FOLDER content=$content_id backend_context="1" lang="$edit_language_id"}
+                            {$exclude_from_tree = "$exclude_from_tree,$ID"}
+                            {/loop}
+                            <input type="hidden" name="content_id" value="{$content_id}" />
+                            <input type="hidden" name="current_tab" value="association" />
+
+                            {ifloop rel="folders"}
+                        <div class="input-group">
+
+                            <select name="additional_category_id" id="accessory_category_id" class="form-control">
+                                <option value="">{intl l='Select a folder...'}</option>
+                                {loop name="folders" type="folder-tree" folder="0" exclude=$exclude_from_tree backend_context="1" lang="$edit_language_id"}
+                                    <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $DEFAULT_FOLDER==$ID}disabled="disabled"{/if}>
+                                        {$TITLE} {if $DEFAULT_FOLDER==$ID}{intl l=' (default)'}{/if}
+                                    </option>
+                                {/loop}
+                            </select>
+
+                                    <span class="input-group-btn" id="content_add_button">
+                                       <button class="btn btn-default btn-primary action-btn" type="submit"><span class="glyphicon glyphicon-plus-sign"></span></button>
+                                    </span>
+
+                        </div>
+                        <span class="help-block">{intl l='Select a folder and click (+) to add it to the additional folder list'}</span>
+                        {/ifloop}
+
+                        {elseloop rel="folders"}
+                            <div class="alert alert-info">{intl l="No Folders found"}</div>
+                        {/elseloop}
+
+                    </form>
+                </div>
+
+                <div class="table-responsive">
+                    <table class="table table-striped table-condensed table-left-aligned">
+                        <thead>
+                        <tr>
+                            <th>{intl l='ID'}</th>
+
+                            <th>{intl l='Folder title'}</th>
+
+                            {module_include location='product_folders_table_header'}
+
+                            <th class="actions">{intl l="Actions"}</th>
+                        </tr>
+                        </thead>
+
+                        <tbody>
+                        {loop name="additional_folders" type="folder" content=$content_id exclude=$DEFAULT_FOLDER backend_context="1" lang="$edit_language_id"}
+                            <tr>
+                                <td>{$ID}</td>
+
+                                <td>
+                                    {$TITLE}
+                                </td>
+
+                                {module_include location='product_folders_table_row'}
+
+                                <td class="actions">
+                                    <div class="btn-group">
+                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.category.delete"}
+                                            <a class="btn btn-default btn-xs delete-category" title="{intl l='Remove the product from this category'}" href="#delete_category_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        {/loop}
+                                    </div>
+                                </td>
+                            </tr>
+                        {/loop}
+
+                        {elseloop rel="additional_folders"}
+                            <tr>
+                                <td colspan="3">
+                                    <div class="alert alert-info">
+                                        {intl l="This product doesn't belong to any additional folder."}
+                                    </div>
+                                </td>
+                            </tr>
+                        {/elseloop}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        {* -- End folders management ------------------------------------- *}
+    </div>
+</div>
\ No newline at end of file