diff --git a/lib/devtools.js b/lib/devtools.js
index bac1536..252a84f 100644
--- a/lib/devtools.js
+++ b/lib/devtools.js
@@ -179,7 +179,7 @@ customElements.define('developer-tooling', class extends HTMLElement {
     this.changePortElem = this.root.querySelector('#change-port')
     this.apps = new Map()
 
-    this.addKeyInputElem.addEventListener('keypress', e => {
+    this.addKeyInputElem.addEventListener('keydown', e => {
       this.addKeyErrorElem.textContent = ''
     })
     this.addKeyFormElem.addEventListener('submit', e => {
@@ -188,8 +188,13 @@ customElements.define('developer-tooling', class extends HTMLElement {
       this.addApp(inspectorKey)
     })
 
-    this.changePortInputElem.addEventListener('keypress', () => {
+    this.changePortInputElem.addEventListener('keydown', e => {
+      const isEscape = e.key === 'Escape'
       this.changePortErrorElem.textContent = ''
+      if (isEscape) {
+        this.changePortFormElem.classList.add('hidden')
+        this.changePortInputElem.value = ''
+      }
     })
     this.changePortShowElem.addEventListener('click', () => {
       this.changePortFormElem.classList.remove('hidden')