diff --git a/app/components/nextflow_component.html.erb b/app/components/nextflow_component.html.erb
index 7a0eb32c06..d5b69a0843 100644
--- a/app/components/nextflow_component.html.erb
+++ b/app/components/nextflow_component.html.erb
@@ -41,7 +41,7 @@
         <%= workflow.text_field :name,
                             value: instance.present? ? instance.name : nil,
                             class:
-                              "bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5  dark:bg-slate-700 dark:border-slate-600 dark:placeholder-slate-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" %>
+                              "bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5  dark:bg-slate-700 dark:border-slate-600 dark:placeholder-slate-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500" %>
       </section>
 
       <%= workflow.hidden_field :namespace_id, value: @namespace_id %>
diff --git a/app/javascript/controllers/nextflow/samplesheet_controller.js b/app/javascript/controllers/nextflow/samplesheet_controller.js
index b25ed7b475..dab6214455 100644
--- a/app/javascript/controllers/nextflow/samplesheet_controller.js
+++ b/app/javascript/controllers/nextflow/samplesheet_controller.js
@@ -575,22 +575,13 @@ export default class extends Controller {
     }, 50);
   }
 
-  // check first sample entry for which columns are available for filter so we don't need to do it for each sample
-  // while filtering
+  // check samplesheet properties for sample and sample_name and add them as filterable if present
   #setFilterableColumns() {
-    if (
-      this.#samplesheetAttributes[0]["samplesheet_params"].hasOwnProperty(
-        "sample",
-      )
-    ) {
+    if (this.#samplesheetProperties.hasOwnProperty("sample")) {
       this.#filterableColumns.push("sample");
     }
 
-    if (
-      this.#samplesheetAttributes[0]["samplesheet_params"].hasOwnProperty(
-        "sample_name",
-      )
-    ) {
+    if (this.#samplesheetProperties.hasOwnProperty("sample_name")) {
       this.#filterableColumns.push("sample_name");
     }
   }