diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 69bdf1df3f..8066223318 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -1379,6 +1379,8 @@ function addTableRow(row) {
   var setting_name = table.attr("name");
   row.addClass(Settings.DATA_ROW_CLASS + " " + Settings.NEW_ROW_CLASS);
 
+  var focusChanged = false;
+
   _.each(row.children(), function(element) {
     if ($(element).hasClass("numbered")) {
       // Index row
@@ -1429,6 +1431,11 @@ function addTableRow(row) {
         });
       }
 
+      if (!focusChanged) {
+          input.focus();
+          focusChanged = true;
+      }
+
       if (isCheckbox) {
         $(input).find("input").attr("data-changed", "true");
       } else {