diff --git a/app/dashboard/templates/dashboard/fido_setup.html b/app/dashboard/templates/dashboard/fido_setup.html
index 424c16fd..198591f8 100644
--- a/app/dashboard/templates/dashboard/fido_setup.html
+++ b/app/dashboard/templates/dashboard/fido_setup.html
@@ -56,6 +56,13 @@
         }
 
         $("#btnRegisterKey").click(registerKey);
+
+        document.getElementById("key_name").addEventListener("keydown", event => {
+          if (event.keyCode === 13) {
+            event.preventDefault();
+            document.getElementById("btnRegisterKey").click();
+          }
+        });
       </script>
 
     </div>