diff --git a/pkg/task/ui/questionnaire.go b/pkg/task/ui/questionnaire.go
index f70daa2..b8db8b9 100644
--- a/pkg/task/ui/questionnaire.go
+++ b/pkg/task/ui/questionnaire.go
@@ -46,6 +46,11 @@ func (q *QuestionnaireModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	if f, ok := form.(*huh.Form); ok {
 		q.form = f
 	}
+
+	if q.form.State == huh.StateCompleted {
+		return q, tea.Quit
+	}
+
 	return q, cmd
 }