diff --git a/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/report/html/internal/RulesHtmlToolkit.java b/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/report/html/internal/RulesHtmlToolkit.java
index 14f8e04b9..969a7cdbb 100644
--- a/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/report/html/internal/RulesHtmlToolkit.java
+++ b/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/report/html/internal/RulesHtmlToolkit.java
@@ -229,7 +229,7 @@ private static String createRuleHtml(
 				displayProgress, id);
 	}
 
-	private static final String HEADING_PATTERN = "<div id=\"{0}_group\"><div id=\"{0}_heading\" style=\"margin-left: {4}px;\" class=\"{2}\"><div onclick=\"overview.link(''{0}'');\"><img class=\"{2}_icon\" alt=\"{1}\" src=\"data:image/png;base64,{3}\"/>{1}</div></div>"; //$NON-NLS-1$
+	private static final String HEADING_PATTERN = "<div id=\"{0}_group\"><div id=\"{0}_heading\" style=\"margin-left: {4}px;\" class=\"{2}\" tabindex=\"0\"><div onclick=\"overview.link(''{0}'');\"><img class=\"{2}_icon\" alt=\"{1}\" src=\"data:image/png;base64,{3}\"/>{1}</div></div>"; //$NON-NLS-1$
 
 	private static String createSubHeading(String id, String name, String type, String image, int margin) {
 		return MessageFormat.format(HEADING_PATTERN, Encode.forHtml(id), Encode.forHtml(name), Encode.forHtml(type),
diff --git a/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rule_result.html b/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rule_result.html
index 5db1e540b..aad152751 100644
--- a/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rule_result.html
+++ b/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rule_result.html
@@ -1,5 +1,5 @@
 <div name="{10}" id="{0}" style="margin-left: {5}px; display: block;" class="rule {4}">
-    <div name="{10}_heading" id="{0}_heading" class="rule_heading">
+    <div name="{10}_heading" id="{0}_heading" class="rule_heading" tabindex="0">
         <div name="{10}_score" id="{0}_score" class="rule_score {4}" style="display: {8};">
 			<div name="{10}_score_bar" id="{0}_score_bar" class="rule_bar {4}" style="width: {1}%;">&nbsp;</div>
 			<div name="{10}_score_value" id="{0}_score_value" class="rule_score_value">{1}</div>
diff --git a/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rules_overview.html b/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rules_overview.html
index e140c1abf..3f873d100 100644
--- a/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rules_overview.html
+++ b/core/org.openjdk.jmc.flightrecorder.rules/src/main/resources/org/openjdk/jmc/flightrecorder/rules/report/html/internal/rules_overview.html
@@ -510,6 +510,21 @@
 					}
 				}
 			}
+			document.body.addEventListener('keydown', function(e) {
+				if (e.key != 'Enter') return;
+				if (e.target.classList.contains('column_title') || e.target.classList.contains('page_heading')) {
+					var id = e.target.id.replace("_heading", "");
+					overview.link(id);
+				}
+				else if (e.target.classList.contains('rule_heading')) {
+					var id = e.target.id;
+					var loc = id.indexOf("_heading")
+					if (loc != -1) {
+						var id_to_toggle = id.slice(0, loc) + "_text";
+						overview.toggleVisibility(id_to_toggle, document.getElementById(id_to_toggle + "_hide"));
+					}
+				}
+			})
 		},
 
 		link : function(name) {