diff --git a/frontend/cli/main.go b/frontend/cli/main.go
index 8314c08b69..13548f2e7d 100644
--- a/frontend/cli/main.go
+++ b/frontend/cli/main.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/alecthomas/kong"
 	kongtoml "github.com/alecthomas/kong-toml"
+	"github.com/alecthomas/types/optional"
 	kongcompletion "github.com/jotaen/kong-completion"
 
 	"github.com/TBD54566975/ftl"
@@ -79,13 +80,14 @@ var cli CLI
 
 func main() {
 	ctx, cancel := context.WithCancel(context.Background())
-
-	app := createKongApplication(&cli)
+	csm := &currentStatusManager{}
+	app := createKongApplication(&cli, csm)
 	kctx, err := app.Parse(os.Args[1:])
 	app.FatalIfErrorf(err)
 
 	if !cli.Plain {
 		sm := terminal.NewStatusManager(ctx)
+		csm.statusManager = optional.Some(sm)
 		ctx = sm.IntoContext(ctx)
 		defer sm.Close()
 	}
@@ -137,7 +139,7 @@ func main() {
 	kctx.FatalIfErrorf(err)
 }
 
-func createKongApplication(cli any) *kong.Kong {
+func createKongApplication(cli any, csm *currentStatusManager) *kong.Kong {
 	gitRoot, _ := internal.GitRoot(".").Get()
 	app := kong.Must(cli,
 		kong.Description(`FTL - Towards a 𝝺-calculus for large-scale systems`),
@@ -158,7 +160,13 @@ func createKongApplication(cli any) *kong.Kong {
 			"numcpu":  strconv.Itoa(runtime.NumCPU()),
 			"gitroot": gitRoot,
 		},
-	)
+		kong.Exit(func(code int) {
+			if sm, ok := csm.statusManager.Get(); ok {
+				sm.Close()
+			}
+			os.Exit(code)
+		},
+		))
 	return app
 }
 
@@ -202,3 +210,7 @@ func makeBindContext(projectConfig projectconfig.Config, logger *log.Logger, can
 	}
 	return bindContext
 }
+
+type currentStatusManager struct {
+	statusManager optional.Option[terminal.StatusManager]
+}