diff --git a/src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/config.jelly b/src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/config.jelly
index 612cad1..9ff9b8e 100644
--- a/src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/config.jelly
@@ -5,7 +5,8 @@
         <f:select />
     </f:entry>
 
-    <a target="_blank" style="display:none;" href="" onclick="window.open(this.href,'window','width=900,height=640,resizable,scrollbars,toolbar,menubar') ;return false;">view selected script</a>
+    <st:adjunct includes="org.jenkinsci.plugins.managedscripts.ScriptBuildStep.script-build-step"/>
+    <a target="_blank" style="display:none;" href="" class="script-build-window-link">view selected script</a>
 
     <f:optionalBlock name="defineArgs" inline="true" title="${%Define arguments}" checked="${!empty(instance.buildStepArgs)}" help="/plugin/managed-scripts/help-defineArgs.html">
         <f:entry field="tokenized">
@@ -16,7 +17,7 @@
                 <div name="argName"><st:nbsp/></div>
                 <input type="text" name="arg" value="${arg}" size="80"/>
                 <input type="button" name="delete_button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
-                <input type="button" name="add_button" onClick="ms_labelArgs()" value="${%Add argument}" class="repeatable-add show-if-last" />
+                <input type="button" name="add_button" value="${%Add argument}" class="repeatable-add show-if-last" />
             </f:entry>
         </f:repeatable>
     </f:optionalBlock>
diff --git a/src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/script-build-step.js b/src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/script-build-step.js
new file mode 100644
index 0000000..f790a46
--- /dev/null
+++ b/src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/script-build-step.js
@@ -0,0 +1,8 @@
+document.addEventListener("DOMContentLoaded", function () {
+    const scriptLink = document.querySelector(".script-build-window-link");
+
+    scriptLink.addEventListener("click", function (e) {
+        e.preventDefault();
+        window.open(e.href, "window", "width=900,height=640,resizable,scrollbars,toolbar,menubar");
+    });
+});