diff --git a/templates/layouts/page-content/layout.html.twig b/templates/layouts/page-content/layout.html.twig
index 86841c4cf..3afe97c03 100644
--- a/templates/layouts/page-content/layout.html.twig
+++ b/templates/layouts/page-content/layout.html.twig
@@ -1,6 +1,11 @@
 <div id="ibo-center-container" class="ibo-center-container {% block iboPageCenterContainerExtraClasses %}{% endblock %}">
 	{% block iboPageCenterContainer %}
 		<main id="ibo-main-content">
+			{# Note: The header is inside the main content div to avoid glitches with other layouts (eg. in a side content layout) #}
+			{% block iboPageHeader %}
+				{{ include('pages/backoffice/extension-blocks/header.html.twig') }}
+			{% endblock %}
+
 			{% block iboPageMainContent %}
 				{% for oSubBlock in oUIBlock.GetMainBlocks() %}
 					{{ render_block(oSubBlock, {aPage: aPage}) }}
@@ -9,6 +14,11 @@
 			{% block iboPageExtraHtml %}
 				{{ oUIBlock.GetExtraHtmlContent()|raw }}
 			{% endblock %}
+
+			{# Note: The footer is inside the main content div to avoid glitches with other layouts (eg. in a side content layout) #}
+			{% block iboPageFooter %}
+				{{ include('pages/backoffice/extension-blocks/footer.html.twig') }}
+			{% endblock %}
 		</main>
 	{% endblock %}
 </div>
\ No newline at end of file
diff --git a/templates/pages/backoffice/itopwebpage/layout.html.twig b/templates/pages/backoffice/itopwebpage/layout.html.twig
index 4c4b06663..a3ec16c9c 100644
--- a/templates/pages/backoffice/itopwebpage/layout.html.twig
+++ b/templates/pages/backoffice/itopwebpage/layout.html.twig
@@ -9,9 +9,7 @@
 			{{ include('pages/backoffice/extension-blocks/banner.html.twig') }}
 			{{ render_block(aLayouts.oTopBar, {aPage: aPage}) }}
 		</div>
-		{{ include('pages/backoffice/extension-blocks/header.html.twig') }}
-		{{ render_block(aLayouts.oPageContent, {aPage: aPage}) }}
-		{{ include('pages/backoffice/extension-blocks/footer.html.twig') }}
+		{{ render_block(aLayouts.oPageContent, {aPage: aPage, aLayouts: aLayouts}) }}
 
 		{# TODO: Remove this when modal development is done #}
 		<div id="at_the_end">{{ aPage.sDeferredContent|raw }}</div>