diff --git a/core-bundle/src/Resources/contao/classes/DataContainer.php b/core-bundle/src/Resources/contao/classes/DataContainer.php
index 4ca66227d13..d7dc24910d3 100644
--- a/core-bundle/src/Resources/contao/classes/DataContainer.php
+++ b/core-bundle/src/Resources/contao/classes/DataContainer.php
@@ -373,7 +373,7 @@ protected function row($strPalette=null)
 			}
 
 			// Validate and save the field
-			if (\in_array($this->strInputName, $paletteFields) || Input::get('act') == 'overrideAll')
+			if ($objWidget->submitInput() && (\in_array($this->strInputName, $paletteFields) || Input::get('act') == 'overrideAll'))
 			{
 				$objWidget->validate();
 
@@ -385,7 +385,7 @@ protected function row($strPalette=null)
 						$this->noReload = true;
 					}
 				}
-				elseif ($objWidget->submitInput())
+				else
 				{
 					$varValue = $objWidget->value;