diff --git a/core-bundle/contao/drivers/DC_Table.php b/core-bundle/contao/drivers/DC_Table.php
index <HASH>..<HASH> 100644
--- a/core-bundle/contao/drivers/DC_Table.php
+++ b/core-bundle/contao/drivers/DC_Table.php
@@ -1809,7 +1809,13 @@ class DC_Table extends \DataContainer implements \listable, \editable
 </div>
 
 </div>
-</form>';
+</form>
+
+<script>
+window.addEvent(\'domready\', function() {
+  $(\''.$this->strTable.'\').getElement(\'input[type="text"]\').focus();
+});
+</script>';
 
 		// Begin the form (-> DO NOT CHANGE THIS ORDER -> this way the onsubmit attribute of the form can be changed by a field)
 		$return = $version . '
@@ -2174,7 +2180,13 @@ window.addEvent(\'domready\', function() {
 </div>
 
 </div>
-</form>';
+</form>
+
+<script>
+window.addEvent(\'domready\', function() {
+  $(\''.$this->strTable.'\').getElement(\'input[type="text"]\').focus();
+});
+</script>';
 
 			// Set the focus if there is an error
 			if ($this->noReload)
[Core] Re-applied the "autofocus the first field" patch (see #<I>)