diff --git a/app/components/nextflow/samplesheet/file_cell_component.html.erb b/app/components/nextflow/samplesheet/file_cell_component.html.erb
index 8ae23dd275..82f3945ac6 100644
--- a/app/components/nextflow/samplesheet/file_cell_component.html.erb
+++ b/app/components/nextflow/samplesheet/file_cell_component.html.erb
@@ -1,4 +1,3 @@
-<div>
 <%= link_to new_workflow_executions_file_selector_path(
   "file_selector[attachable_id]": @attachable.id,
   "file_selector[attachable_type]": @attachable.class.to_s,
@@ -32,4 +31,3 @@ data: {
     <%= @selected.empty? ? t(".no_selected_file") : @selected[:filename] %>
   </div>
 <% end %>
-</div>
diff --git a/app/components/nextflow_component.html.erb b/app/components/nextflow_component.html.erb
index 17a26e461e..523a40a3c5 100644
--- a/app/components/nextflow_component.html.erb
+++ b/app/components/nextflow_component.html.erb
@@ -124,7 +124,7 @@
     <button
       class="button button--state-primary button--size-default"
       data-nextflow--samplesheet-target="submit"
-      data-action="click->nextflow--samplesheet#validateAttachments"
+      data-action="click->nextflow--samplesheet#validateForm"
     >
       <% if instance.nil? %>
         <%= t(:"workflow_executions.submissions.create.submit") %>
diff --git a/app/javascript/controllers/nextflow/samplesheet_controller.js b/app/javascript/controllers/nextflow/samplesheet_controller.js
index 3b07e162e3..0fd1ffe22b 100644
--- a/app/javascript/controllers/nextflow/samplesheet_controller.js
+++ b/app/javascript/controllers/nextflow/samplesheet_controller.js
@@ -33,7 +33,7 @@ export default class extends Controller {
     });
   }
 
-  validateAttachments(event) {
+  validateForm(event) {
     event.preventDefault();
     let readyToSubmit = true;
     const requiredFileCells = document.querySelectorAll(