diff --git a/openid-connect-server/src/main/webapp/resources/js/admin.js b/openid-connect-server/src/main/webapp/resources/js/admin.js
index de9e9bb49..7a90c3565 100644
--- a/openid-connect-server/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server/src/main/webapp/resources/js/admin.js
@@ -60,7 +60,14 @@
         }),
 
         events:{
-            "click button": "addItem"
+            "click button":"addItem",
+            "keypress input":function (e) {
+                if (e.which == 13) {
+                    this.addItem();
+                    e.preventDefault();
+                    $("input", this.$el).focus();
+                }
+            }
         },
 
         initialize:function () {