diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index e89180e02..82f9bac78 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -149,11 +149,10 @@
 {if !$simple_header}
 		<input type="hidden" name="token" value="{$token}" />
 	</div>
-</form>
 {else}
 	</div>
 {/if}
-
+</form>
 
 {hook h='displayAdminListAfter'}
 {if isset($name_controller)}
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 5042f3bdc..cb2043bde 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -74,8 +74,8 @@
 
 <div class="alert alert-warning" id="{$list_id}-empty-filters-alert" style="display:none;">{l s='Please fill at least one field to perform a search in this list.'}</div>
 
-{if !$simple_header}
 <form method="post" action="{$action}" class="form-horizontal">
+{if !$simple_header}
 	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 	{block name="override_form_extra"}{/block}
 	<div class="panel col-lg-12">