diff --git a/admin-dev/themes/template/footer.tpl b/admin-dev/themes/template/footer.tpl
index 691f5c64c..1cb46ffae 100644
--- a/admin-dev/themes/template/footer.tpl
+++ b/admin-dev/themes/template/footer.tpl
@@ -26,6 +26,7 @@
 
 					</div>
 				</div>
+{if $display_footer}
 				{$HOOK_FOOTER}
 				<div id="footer">
 					<div style="float:left;margin-left:10px;padding-top:6px">
@@ -44,5 +45,6 @@
 			</div>
 		</div>
 		<div id="ajax_confirmation" style="display:none"></div>
+{/if}
 	</body>
 </html>
diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl
index 12e41c2c7..453edca64 100644
--- a/admin-dev/themes/template/header.tpl
+++ b/admin-dev/themes/template/header.tpl
@@ -142,6 +142,7 @@ $(document).ready(function()
 </script>
 	</head>
 	<body {if $bo_color} style="background:{$bo_color}" {/if}>
+{if $display_header}
 	<div id="top_container">
 		<div id="container">
 			<div id="header_infos"><span>
@@ -285,6 +286,7 @@ $(document).ready(function()
 					{/if}
 				</ul>
 *}
+{/if}
 					<div id="main">
 						<div id="content">
 							{if $install_dir_exists}
diff --git a/admin-dev/themes/template/layout.tpl b/admin-dev/themes/template/layout.tpl
index 3b4093714..44053ba90 100644
--- a/admin-dev/themes/template/layout.tpl
+++ b/admin-dev/themes/template/layout.tpl
@@ -23,9 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if $display_header}
-	{include file='header.tpl'}
-{/if}
+{include file='header.tpl'}
 {if isset($conf)}
 	<div class="conf">
 		<img src="../img/admin/ok2.png" alt="" />{$conf}
@@ -115,6 +113,4 @@
 {/if}
 
 {$page}
-{if $display_footer}
-	{include file='footer.tpl'}
-{/if}
+{include file='footer.tpl'}
