diff --git a/apps/dev-workbench/workbench.html b/apps/dev-workbench/workbench.html
index e59bcb6d5..330ce9d39 100644
--- a/apps/dev-workbench/workbench.html
+++ b/apps/dev-workbench/workbench.html
@@ -67,7 +67,7 @@
       class="navbar navbar-expand-lg navbar-dark flex-row px-2"
       style="background: rgb(33, 37, 41);"
     >
-      <div style="cursor: pointer;" id="goBack" tabindex="0">
+      <div role="button" aria-label="Go back" style="cursor: pointer;" id="goBack" tabindex="0">
         <i data-feather="arrow-left" class="text-white"></i>
       </div>
 
diff --git a/apps/dev-workbench/workbench.js b/apps/dev-workbench/workbench.js
index 2a408cd2c..39a6de33c 100644
--- a/apps/dev-workbench/workbench.js
+++ b/apps/dev-workbench/workbench.js
@@ -8,6 +8,13 @@ $('#goBack').click(function() {
   window.history.back();
 });
 
+// Keydown event for the back button
+$('#goBack').keydown(function(e) {
+    if (e.keyCode === 13) {
+      window.history.back();
+  }
+});
+
 // initialize Step 1
 function dataSelect() {
   $('.navbar-brand').text(' Workbench - Step 1');