diff --git a/apps/dashboard/app/helpers/scripts_helper.rb b/apps/dashboard/app/helpers/scripts_helper.rb
index 804edda226..f3477522a7 100644
--- a/apps/dashboard/app/helpers/scripts_helper.rb
+++ b/apps/dashboard/app/helpers/scripts_helper.rb
@@ -60,4 +60,8 @@ def auto_accounts_template
   def script_form_double
     BootstrapForm::FormBuilder.new('script', nil, self, {})
   end
+
+  def script_removable_field?(id)
+    !['script_auto_scripts'].include?(id.to_s)
+  end
 end
diff --git a/apps/dashboard/app/javascript/packs/script_edit.js b/apps/dashboard/app/javascript/packs/script_edit.js
index 63bdb8f4c9..429a905c97 100644
--- a/apps/dashboard/app/javascript/packs/script_edit.js
+++ b/apps/dashboard/app/javascript/packs/script_edit.js
@@ -21,15 +21,32 @@ const newFieldData = {
   }
 }
 
-function lastOption() {
-  return $('.new_script').find('.editable-form-field').last();
+function addNewFieldButton() {
+  return $('#add_new_field_button');
+}
+
+function enableNewFieldButton() {
+  const newFieldButton = addNewFieldButton();
+  for(let newField in newFieldData) {
+    const field = document.getElementById(`script_${newField}`);
+    if(field === null) {
+      // There is at least one field to be added.
+      // Enabled add button.
+      newFieldButton.text('Add new option');
+      newFieldButton.attr('disabled', false);
+      return;
+    }
+  }
+
+  newFieldButton.text('No more options');
 }
 
 function addNewField(_event) {
-  const last = lastOption();
-  last.after(newFieldTemplate.html());
+  const newFieldButton = addNewFieldButton();
+  newFieldButton.attr('disabled', true);
+  newFieldButton.before(newFieldTemplate.html());
 
-  const justAdded = last.next();
+  const justAdded = newFieldButton.prev();
   const deleteButton = justAdded.find('.btn-danger');
   const addButton = justAdded.find('.btn-success');
   const selectMenu = justAdded.find('select');
@@ -69,12 +86,14 @@ function addHelpTextForOption(event) {
 function removeInProgressField(event) {
   const entireDiv = event.target.parentElement.parentElement.parentElement;
   entireDiv.remove();
+  enableNewFieldButton()
 }
 
 function removeField(event) {
   // TODO: shouldn't be able to remove cluster & script form fields.
   const entireDiv = event.target.parentElement;
   entireDiv.remove();
+  enableNewFieldButton();
 }
 
 function showEditField(event) {
@@ -108,10 +127,10 @@ function addInProgressField(event) {
   const choice = selectMenu.value;
   const template = $(`#${choice}_template`);
 
-  const last = lastOption();
-  last.after(template.html());
+  const newFieldButton = addNewFieldButton();
+  newFieldButton.before(template.html());
 
-  const justAdded = last.next();
+  const justAdded = newFieldButton.prev();
   justAdded.find('.btn-danger')
            .on('click', (event) => { removeField(event) });
 
@@ -126,6 +145,7 @@ function addInProgressField(event) {
 
   const entireDiv = event.target.parentElement.parentElement.parentElement;
   entireDiv.remove();
+  enableNewFieldButton();
 }
 
 function fixedFieldEnabled(checkbox, dataElement) {
diff --git a/apps/dashboard/app/views/scripts/editable_form_fields/_edit_field_buttons.html.erb b/apps/dashboard/app/views/scripts/editable_form_fields/_edit_field_buttons.html.erb
index 13f0546445..b816afad6a 100644
--- a/apps/dashboard/app/views/scripts/editable_form_fields/_edit_field_buttons.html.erb
+++ b/apps/dashboard/app/views/scripts/editable_form_fields/_edit_field_buttons.html.erb
@@ -1,4 +1,6 @@
 <button id='<%= "edit_#{field_id}" %>' class="btn btn-primary mx-1" type="button"><%= t('dashboard.edit') %></button>
 <button id='<%= "save_#{field_id}" %>' class="btn btn-success ml-3 mr-1 d-none" type="button"><%= t('dashboard.save') %></button>
 
-<button id='<%= "remove_#{field_id}" %>' class="btn btn-danger mx-1 float-right" type="button"><%= t('dashboard.remove') %></button>
+<% if script_removable_field?(field_id) %>
+  <button id='<%= "remove_#{field_id}" %>' class="btn btn-danger mx-1 float-right" type="button"><%= t('dashboard.remove') %></button>
+<% end %>