diff --git a/tabby-core/src/services/selector.service.ts b/tabby-core/src/services/selector.service.ts
index 5687ec7d..717179e6 100644
--- a/tabby-core/src/services/selector.service.ts
+++ b/tabby-core/src/services/selector.service.ts
@@ -21,7 +21,7 @@ export class SelectorService {
     show <T> (name: string, options: SelectorOption<T>[]): Promise<T> {
         const modal = this.ngbModal.open(SelectorModalComponent)
         this.current = modal
-        modal.result.then(() => {
+        modal.result.finally(() => {
             this.current = null
         })
         const instance: SelectorModalComponent<T> = modal.componentInstance