diff --git a/templates/layout.html b/templates/layout.html
index 5b882b9..ba0fb9e 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -39,6 +39,14 @@
 			$("#host option[value='{{host}}']").attr("selected", "selected")
 			$("#host").change()
 
+			keypress_handler = function(e) {
+				if (e.which == 13) {
+					$("#submit").click() 
+				}
+			};
+			$("#prefix").keypress(keypress_handler)
+			$("#name").keypress(keypress_handler)
+
 	});
 </script>
 <div id="page">