diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 88792fa84..430912e4d 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -339,7 +339,10 @@
 								</p>
 							{/if}
 							{if isset($input.lang) && isset($languages)}<div class="clear"></div>{/if}
-						{block name="end_field_block"}</div>{/block}
+						{block name="end_field_block"}
+							</div>
+							<div class="clear"></div>
+						{/block}
 						{/if}
 						{if $input.name == 'id_state'}
 							</div>
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index e5a2de47f..bc96aaf79 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -190,7 +190,10 @@
 				{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
 				{if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in this shop context'}</p>{/if}
 				</div>
-				{block name="end_field_block"}</div>{/block}
+				{block name="end_field_block"}
+					</div>
+					<div class="clear"></div>
+				{/block}
 			{/if}
 		{/foreach}
 		{if isset($categoryData['submit'])}