diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 6f7a9eae38..fa27ed0abd 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -185,19 +185,21 @@
         <div id="idFrameC" class="PNB" style="right:auto;width:{{ w1 ~ '%' }}">
             <div class="PNB wrapper">
                 <div class="tabs ui-tabs">
-                    <div id="retractableButton"></div>
-                    {% include 'prod/tab_headers.html.twig' %}
-                    <div id="baskets" class="PNB">
-                        {% import 'prod/WorkZone/Macros.html.twig'  as  WorkZoneMacros %}
-                        {{WorkZoneMacros.make_bloc(app, WorkZone)}}
-                    </div>
-                    {% if GV_thesaurus %}
-                    <div id="proposals" class="PNB"
-                        ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
-                        <button id="facets-back-btn" style="display:none;">back</button>
-                    </div>
-                    {% include 'prod/tab_thesaurus.html.twig' with {has_access_to_module: app['acl'].get(app['authentication'].getUser()).has_access_to_module('thesaurus')} %}
-                    {% endif %}
+                    {% block tabs_panel %}
+                        <div id="retractableButton"></div>
+                        {% include 'prod/tab_headers.html.twig' %}
+                        <div id="baskets" class="PNB">
+                            {% import 'prod/WorkZone/Macros.html.twig'  as  WorkZoneMacros %}
+                            {{WorkZoneMacros.make_bloc(app, WorkZone)}}
+                        </div>
+                        {% if GV_thesaurus %}
+                            <div id="proposals" class="PNB"
+                                ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
+                                <button id="facets-back-btn" style="display:none;">back</button>
+                            </div>
+                            {% include 'prod/tab_thesaurus.html.twig' with {has_access_to_module: app['acl'].get(app['authentication'].getUser()).has_access_to_module('thesaurus')} %}
+                        {% endif %}
+                    {% endblock %}
                 </div>
             </div>
             <div id="basket_menu" class="context-menu context-menu-theme-vista" style="display:none;">
diff --git a/templates/web/prod/tab_headers.html.twig b/templates/web/prod/tab_headers.html.twig
index 7988a27a60..2ca2883cee 100644
--- a/templates/web/prod/tab_headers.html.twig
+++ b/templates/web/prod/tab_headers.html.twig
@@ -1,24 +1,26 @@
-{% block tab_headers %}
+{% block tab_headers_wrapper %}
     <ul class="icon-menu ui-tabs-nav ui-helper-reset">
-        {% if GV_thesaurus %}
-            <li class="proposals_WZ">
-                <a href="#proposals" class="WZtabs">
-                    <img class="proposals_off" src="/skins/icons/proposition_off32.png"
-                         title="{{ 'phraseanet:: propositions' | trans }}"/>
-                    <img class="proposals_on" src="/skins/icons/proposition_on32.png"
-                         title="{{ 'phraseanet:: propositions' | trans }}"/>
+        {% block tab_headers %}
+            {% if GV_thesaurus %}
+                <li class="proposals_WZ">
+                    <a href="#proposals" class="WZtabs">
+                        <img class="proposals_off" src="/skins/icons/proposition_off32.png"
+                             title="{{ 'phraseanet:: propositions' | trans }}"/>
+                        <img class="proposals_on" src="/skins/icons/proposition_on32.png"
+                             title="{{ 'phraseanet:: propositions' | trans }}"/>
+                    </a>
+                </li>
+                <li class="thesaurus">
+                    <a href="#thesaurus_tab" class="WZtabs">
+                        <img src="/skins/icons/thesaurus_32.png" title="{{ 'phraseanet:: thesaurus' | trans }}"/>
+                    </a>
+                </li>
+            {% endif %}
+            <li class="ui-tabs-selected ui-corner-top baskets">
+                <a href="#baskets" class="WZbasketTab">
+                    <div id="basket_menu_trigger">&#9660;</div>
                 </a>
             </li>
-            <li class="thesaurus">
-                <a href="#thesaurus_tab" class="WZtabs">
-                    <img src="/skins/icons/thesaurus_32.png" title="{{ 'phraseanet:: thesaurus' | trans }}"/>
-                </a>
-            </li>
-        {% endif %}
-        <li class="ui-tabs-selected ui-corner-top baskets">
-            <a href="#baskets" class="WZbasketTab">
-                <div id="basket_menu_trigger">&#9660;</div>
-            </a>
-        </li>
+        {% endblock %}
     </ul>
 {% endblock %}