diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index 546e01fb..d50bd9e3 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -124,7 +124,7 @@
                 <st:include from="${from.getRowHeaders()}" it="${from}"
                             page="rowHeader.jelly"/>
 
-                <div class="pipeline">
+                <div class="pipeline main-pipeline-selector">
                     <table class="pipelines">
                         <tbody>
                             <j:forEach begin="${0}" end="${buildGrid.rows - 1}" indexVar="x">
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
index 8233a9b8..12dda99c 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
@@ -83,8 +83,7 @@ const onclickElements = {
 };
 
 document.addEventListener("DOMContentLoaded", function () {
-    const parentElement = document.querySelector(".pipelines");
-    if (!parentElement) return;
+    const parentElement = document.querySelector(".main-pipeline-selector");
 
     Object.entries(onclickElements).forEach(function(entry) {
         const selector = entry[0];