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 7bcb8a4b..6d72ac68 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
@@ -1,6 +1,6 @@
 Behaviour.specify(".progress-console-onclick", 'progress-bar-click', 0, function (progressBarElement) {
 
-    const dataContainer = document.querySelector(".fill-dialog-data-container");
+    const dataContainer = document.querySelector(".fill-dialog-params-statusbar");
     const href = dataContainer.dataset.fillDialogHref;
     const title = dataContainer.dataset.fillDialogTitle;
 
@@ -8,3 +8,14 @@ Behaviour.specify(".progress-console-onclick", 'progress-bar-click', 0, function
         buildPipeline.fillDialog(href, title);
     });
 });
+
+Behaviour.specify(".console-icon-onlick", 'console-icon-click', 0, function (consoleIconElement) {
+
+    const dataContainer = document.querySelector(".fill-dialog-params-console-output-icon");
+    const href = dataContainer.dataset.fillDialogHref;
+    const title = dataContainer.dataset.fillDialogTitle;
+
+    consoleIconElement.addEventListener('click', () => {
+        buildPipeline.fillDialog(href, title);
+    });
+});
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly
index 417e3844..3b96b954 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly
@@ -61,7 +61,7 @@
         {{#unless project.disabled}}
         <div class="status-bar" id="status-bar-{{id}}">
             {{#if build.isBuilding}}
-                <span class="fill-dialog-data-container" data-fill-dialog-href="${app.rootUrl}{{build.url}}console" data-fill-dialog-title="Console output for {{project.name}} #{{build.number}}" style="display:none"/>
+                <span class="fill-dialog-params-statusbar" data-fill-dialog-href="${app.rootUrl}{{build.url}}console" data-fill-dialog-title="Console output for {{project.name}} #{{build.number}}" style="display:none"/>
                 <div class="progress-console-onclick">
                     <table class="progress-bar" align="center">
                         <tbody>
@@ -95,7 +95,8 @@
                             </a>
                         </j:when>
                         <j:otherwise>
-                            <span onclick="buildPipeline.fillDialog('${app.rootUrl}{{build.url}}console', 'Console output for {{project.name}} #{{build.number}}')">
+                            <span class="fill-dialog-params-console-output-icon" data-fill-dialog-href="${app.rootUrl}{{build.url}}console" data-fill-dialog-title="Console output for {{project.name}} #{{build.number}}" style="display:none"/>
+                            <span class="console-icon-onlick" >
                                 <l:icon src="${consoleOutputIconUrl} icon-sm" alt="console" />
                             </span>
                         </j:otherwise>