diff --git a/src/main/java/org/jenkinsci/plugins/p4/console/P4ConsoleAnnotator.java b/src/main/java/org/jenkinsci/plugins/p4/console/P4ConsoleAnnotator.java
index 858345282..48a5194d4 100644
--- a/src/main/java/org/jenkinsci/plugins/p4/console/P4ConsoleAnnotator.java
+++ b/src/main/java/org/jenkinsci/plugins/p4/console/P4ConsoleAnnotator.java
@@ -30,22 +30,18 @@ public ConsoleAnnotator<Object> annotate(Object context, MarkupText text) {
 	private void push(MarkupText text) {
 		text.hide(0, COMMAND.length());
 
-		String head = "<span class=\"titleDiv\">";
+		String head = "<span class=\"p4-titleDiv\">";
 		text.addMarkup(COMMAND.length(), head);
 
 		StringBuffer sb = new StringBuffer();
-		sb.append(" <a class=\"linkDiv\" id=\"");
-		sb.append("p4title" + id);
-		sb.append("\" href=\"javascript:toggle('");
+		sb.append(" <a class=\"p4-linkDiv\" href=\"#\" data-content-id=\"");
 		sb.append("p4content" + id);
-		sb.append("','");
-		sb.append("p4title" + id);
-		sb.append("');\">");
+		sb.append("\">");
 		sb.append("+");
 		sb.append("</a>");
 		sb.append("</span>");
 
-		sb.append("<div class=\"contentDiv\">");
+		sb.append("<div class=\"p4-contentDiv\">");
 		sb.append("<div id=\"");
 		sb.append("p4content" + id);
 		sb.append("\" style=\"display: none;\">");
diff --git a/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/script.js b/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/script.js
index 1cd34a036..b1340444c 100644
--- a/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/script.js
+++ b/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/script.js
@@ -11,4 +11,13 @@ function toggle(showHideDiv, switchTextDiv) {
 	}
 }
 
+Behaviour.specify("a.p4-linkDiv", 'a.p4-linkDiv', 0, function(el) {
+	el.onclick = function(evt) {
+		evt.preventDefault();
 
+		let contentId = el.dataset.contentId;
+		let linkId = el.id;
+
+		toggle(contentId, linkId);
+	}
+});
diff --git a/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/style.css b/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/style.css
index 303619e42..38d6bea92 100644
--- a/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/style.css
+++ b/src/main/resources/org/jenkinsci/plugins/p4/console/P4ConsoleNote/style.css
@@ -1,18 +1,18 @@
-span.titleDiv {
+span.p4-titleDiv {
 	color: #008000;
 }
 
-div.titleDiv {
+div.p4-titleDiv {
 	color: #008000;
 }
 
-a.linkDiv {
+a.p4-linkDiv {
 	text-decoration: none;
 	font-weight: bold;
 	color: #0000FF;
 }
 
-div.contentDiv {
+div.p4-contentDiv {
 	color: #505050;
 	background-color: #f0f0f0;
 }
diff --git a/src/main/webapp/script.js b/src/main/webapp/script.js
index 1cd34a036..b1340444c 100644
--- a/src/main/webapp/script.js
+++ b/src/main/webapp/script.js
@@ -11,4 +11,13 @@ function toggle(showHideDiv, switchTextDiv) {
 	}
 }
 
+Behaviour.specify("a.p4-linkDiv", 'a.p4-linkDiv', 0, function(el) {
+	el.onclick = function(evt) {
+		evt.preventDefault();
 
+		let contentId = el.dataset.contentId;
+		let linkId = el.id;
+
+		toggle(contentId, linkId);
+	}
+});