diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
new file mode 100644
index 0000000..2d2154f
--- /dev/null
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
@@ -0,0 +1,6 @@
+document.addEventListener("DOMContentLoaded", function () {
+  document.querySelector("#tagButton input").addEventListener("click", function () {
+    document.getElementById("tagForm").style.display = "block";
+    document.getElementById("tagButton").style.display = "none";
+  });
+});
diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
index 41be59f..7926d59 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
@@ -87,9 +87,9 @@ THE SOFTWARE.
           </p>
 
           <j:if test="${h.hasPermission(it.build,it.permission)}">
+            <st:adjunct includes="hudson.scm.cvstagging.CvsTagAction.create-another-tag"/>
             <p id="tagButton">
-              <input type="button" value="${%Create another tag}"
-                     onclick="Element.show('tagForm');Element.hide('tagButton')"/>
+              <input type="button" value="${%Create another tag}"/>
             </p>
 
             <div id="tagForm" style="display:none;">