diff --git a/ChangeLog b/ChangeLog
index 0ccfdcd39d296ab0c59745cf5c5f44ac7f5d79c1..f82f41504cd93a02d74708e5ab95664c9d89ebb2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
 
 2010-10-17  Benjamin Mack  <benni@typo3.org>
 
+	* Followup to #16006: Remove the checkbox that clears the input fields in TCE-forms and replace it with a sprite icon - fix for flexforms (Thanks to Jo Hasenau)
 	* Added feature #15844: Use HTML5 as the default TYPO3 Backend doktype
 	* Added feature #16026: Added hook / Cannot hook into the marker replacement functionality for BE templates
 	* Fixed bug #16020: Streamline usage of template.php:dynTabMenu
diff --git a/t3lib/class.t3lib_tceforms.php b/t3lib/class.t3lib_tceforms.php
index 65af6445d54d7352b2855db4772d5157f6a75b2d..983a3e69d6ff2c11882153bf0efd0da9fac39ed2 100644
--- a/t3lib/class.t3lib_tceforms.php
+++ b/t3lib/class.t3lib_tceforms.php
@@ -1203,7 +1203,7 @@ class t3lib_TCEforms	{
 				htmlspecialchars($iOnChange) . '"' . $PA['onFocus'] . ' />'; // This is the EDITABLE form field.
 		$item .= '<input type="hidden" name="' . $PA['itemFormElName'] . '" value="' .
 				htmlspecialchars($PA['itemFormElValue']) . '" />'; // This is the ACTUAL form field - values from the EDITABLE field must be transferred to this field which is the one that is written to the database.
-		$item .= $fieldAppendix . '</span>';
+		$item .= $fieldAppendix . '</span><div style="clear:both;"></div>';
 		$this->extJSCODE .= 'typo3form.fieldSet(' . $paramsList . ');';
 
 			// going through all custom evaluations configured for this field