diff --git a/packages/ui/src/components/permission-approval-modal.tsx b/packages/ui/src/components/permission-approval-modal.tsx
index 3f899322..33970125 100644
--- a/packages/ui/src/components/permission-approval-modal.tsx
+++ b/packages/ui/src/components/permission-approval-modal.tsx
@@ -120,6 +120,13 @@ const PermissionApprovalModal: Component<PermissionApprovalModalProps> = (props)
     onCleanup(() => document.removeEventListener("keydown", closeOnEscape))
   })
 
+  createEffect(() => {
+    if (!props.isOpen) return
+    if (queue().length === 0) {
+      props.onClose()
+    }
+  })
+
   function handleBackdropClick(event: MouseEvent) {
     if (event.target === event.currentTarget) {
       props.onClose()