diff --git a/templates/backOffice/default/assets/less/thelia/thelia.less b/templates/backOffice/default/assets/less/thelia/thelia.less
index 849d6caf3..ce9da65a9 100644
--- a/templates/backOffice/default/assets/less/thelia/thelia.less
+++ b/templates/backOffice/default/assets/less/thelia/thelia.less
@@ -222,10 +222,6 @@
     }
 }
 
-.module-tab {
-  margin-top: 1.5em;
-}
-
 .tab-content {
     // Center loading indicator
     .loading {
diff --git a/templates/backOffice/default/category-edit.html b/templates/backOffice/default/category-edit.html
index 5286e3ac9..8f3fc4e40 100644
--- a/templates/backOffice/default/category-edit.html
+++ b/templates/backOffice/default/category-edit.html
@@ -260,7 +260,17 @@
                                     {include file='includes/document-upload-form.html' documentType='category' parentId=$ID}
                                 </div>
 
-                                <div class="tab-pane fade module-tab" id="modules">
+                                <div class="tab-pane fade" id="modules">
+                                    <div class="form-container">
+                                        {include
+                                        file = "includes/inner-form-toolbar.html"
+                                        hide_submit_buttons = true
+                                        page_url  = {$pageUrl}
+                                        close_url = {$closeUrl}
+                                        current_tab = "modules"
+                                        }
+                                    </div>
+
                                     {module_include location='category-edit' countvar='module_count'}
 
                                     {if $countvar == 0}
diff --git a/templates/backOffice/default/content-edit.html b/templates/backOffice/default/content-edit.html
index 3d8f778fe..49c8f6b66 100644
--- a/templates/backOffice/default/content-edit.html
+++ b/templates/backOffice/default/content-edit.html
@@ -155,7 +155,17 @@
             {include file='includes/document-upload-form.html' documentType='content' parentId=$content_id}
         </div>
 
-        <div class="tab-pane fade module-tab" id="modules">
+        <div class="tab-pane fade" id="modules">
+            <div class="form-container">
+                {include
+                    file = "includes/inner-form-toolbar.html"
+                    hide_submit_buttons = true
+                    page_url  = {$pageUrl}
+                    close_url = {$closeUrl}
+                    current_tab = "modules"
+                }
+            </div>
+
             {module_include location='content-edit' countvar='module_count'}
 
             {if $countvar == 0}
diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html
index 22523bc7a..bff41f094 100644
--- a/templates/backOffice/default/folder-edit.html
+++ b/templates/backOffice/default/folder-edit.html
@@ -141,7 +141,16 @@
                                 {include file='includes/document-upload-form.html' documentType='folder' parentId=$ID}
 		                    </div>
 
-		                    <div class="tab-pane fade module-tab" id="modules">
+		                    <div class="tab-pane fade" id="modules">
+                                <div class="form-container">
+                                    {include
+                                    file = "includes/inner-form-toolbar.html"
+                                    hide_submit_buttons = true
+                                    page_url  = {$pageUrl}
+                                    close_url = {$closeUrl}
+                                    current_tab = "modules"
+                                    }
+                                </div>
 
                                 {module_include location='folder-edit' countvar='module_count'}
 
diff --git a/templates/backOffice/default/includes/inner-form-toolbar.html b/templates/backOffice/default/includes/inner-form-toolbar.html
index 6e7835e73..92bee1af8 100644
--- a/templates/backOffice/default/includes/inner-form-toolbar.html
+++ b/templates/backOffice/default/includes/inner-form-toolbar.html
@@ -16,7 +16,12 @@ Parameters:
 		<ul class="nav nav-pills">
 		    {loop name="lang_list" type="lang"}
 		    <li {if $ID == $edit_language_id}class="active"{/if}>
-		        <a class="language-change-button" data-language-id="{$ID}" href="{url path={$page_url|default:$current_url nofilter} edit_language_id=$ID}" title="{intl l='Edit information in %lng' lng=$TITLE}">
+                {if $current_tab}
+                    {$lang_url = {url path={$page_url|default:$current_url nofilter} edit_language_id=$ID current_tab=$current_tab}}
+                {else}
+                    {$lang_url = {url path={$page_url|default:$current_url nofilter} edit_language_id=$ID}}
+                {/if}
+		        <a class="language-change-button" data-language-id="{$ID}" href="{$lang_url nofilter}" title="{intl l='Edit information in %lng' lng=$TITLE}">
 		            <img src="{image file="../assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" />
 		        </a>
 		    </li>
diff --git a/templates/backOffice/default/includes/seo-tab.html b/templates/backOffice/default/includes/seo-tab.html
index 16b31ecb7..17d64575c 100644
--- a/templates/backOffice/default/includes/seo-tab.html
+++ b/templates/backOffice/default/includes/seo-tab.html
@@ -7,6 +7,7 @@
             hide_submit_buttons = false
             page_url  = {$pageUrl}
             close_url = {$closeUrl}
+            current_tab = "seo"
         }
 
         {* Hidden field *}
diff --git a/templates/backOffice/default/product-edit.html b/templates/backOffice/default/product-edit.html
index d8a95d9a6..0eb56fed4 100644
--- a/templates/backOffice/default/product-edit.html
+++ b/templates/backOffice/default/product-edit.html
@@ -108,7 +108,17 @@
                                     <div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
                                 </div>
 
-                                <div class="tab-pane fade module-tab" id="modules">
+                                <div class="tab-pane fade" id="modules">
+                                    <div class="form-container">
+                                        {include
+                                        file = "includes/inner-form-toolbar.html"
+                                        hide_submit_buttons = true
+                                        page_url  = {$pageUrl}
+                                        close_url = {$closeUrl}
+                                        current_tab = "modules"
+                                        }
+                                    </div>
+
                                     {module_include location='product-edit' countvar='module_count'}
 
                                     {if $countvar == 0}