diff --git a/src/widgets/ServicePickerModal.ts b/src/widgets/ServicePickerModal.ts
index 4674fc1..792f0e4 100644
--- a/src/widgets/ServicePickerModal.ts
+++ b/src/widgets/ServicePickerModal.ts
@@ -205,6 +205,11 @@ export class ServicePickerModal {
       this.handleSelect()
     })
 
+    // ESC in list - close modal
+    this.listBox.key(['escape', 'q'], () => {
+      this.hide()
+    })
+
     // Back to search
     this.listBox.key(['/', 'i'], () => {
       this.searchBox.focus()