diff --git a/add.tag b/add.tag
index 15f9ab2..07d3eb1 100644
--- a/add.tag
+++ b/add.tag
@@ -38,6 +38,12 @@
       if (!registryUI.addTag.dialog.showModal) {
         dialogPolyfill.registerDialog(registryUI.addTag.dialog);
       }
+      this['add-server-input'].onkeyup = function (e) {
+        // if keyCode is Enter
+        if (e.keyCode == 13) {
+          registryUI.addTag.add();
+        }
+      };
     });
     registryUI.addTag.show = function () {
       registryUI.addTag.dialog.showModal();
@@ -51,6 +57,7 @@
       registryUI.addTag.dialog.close();
     };
     registryUI.addTag.close = function () {
+      registryUI.addTag.addServer.value = '';
       registryUI.addTag.dialog.close();
     };
     registryUI.addTag.update();
diff --git a/change.tag b/change.tag
index 02471b5..7829f23 100644
--- a/change.tag
+++ b/change.tag
@@ -39,6 +39,12 @@
       if (!registryUI.changeTag.dialog.showModal) {
         dialogPolyfill.registerDialog(registryUI.changeTag.dialog);
       }
+      this['server-list'].onkeyup = function (e) {
+        // if keyCode is Enter
+        if (e.keyCode == 13) {
+          registryUI.changeTag.change();
+        }
+      };
     });
     registryUI.changeTag.show = function () {
       registryUI.changeTag.update();