diff --git a/pkg/cmd/codespace/delete.go b/pkg/cmd/codespace/delete.go
index 74a1dd298..a33cdd8b6 100644
--- a/pkg/cmd/codespace/delete.go
+++ b/pkg/cmd/codespace/delete.go
@@ -83,17 +83,19 @@ func (a *App) Delete(ctx context.Context, opts deleteOptions) (err error) {
 	var codespaces []*api.Codespace
 	nameFilter := opts.codespaceName
 	if nameFilter == "" {
-		a.StartProgressIndicatorWithLabel("Fetching codespaces")
-		userName := opts.userName
-		if userName == "" && opts.orgName != "" {
-			currentUser, err := a.apiClient.GetUser(ctx)
-			if err != nil {
-				return err
+		var codespaces []*api.Codespace
+		err = a.RunWithProgress("Fetching codespaces", func() (err error) {
+			userName := opts.userName
+			if userName == "" && opts.orgName != "" {
+				currentUser, err := a.apiClient.GetUser(ctx)
+				if err != nil {
+					return err
+				}
+				userName = currentUser.Login
 			}
-			userName = currentUser.Login
-		}
-		codespaces, err = a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: userName})
-		a.StopProgressIndicator()
+			codespaces, err = a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: userName})
+			return
+		})
 		if err != nil {
 			return fmt.Errorf("error getting codespaces: %w", err)
 		}