diff --git a/internal/codespaces/api/api.go b/internal/codespaces/api/api.go
index 6fd9e4d18..531b2b3f8 100644
--- a/internal/codespaces/api/api.go
+++ b/internal/codespaces/api/api.go
@@ -425,7 +425,7 @@ type CreateCodespaceParams struct {
 func (a *API) CreateCodespace(ctx context.Context, params *CreateCodespaceParams) (*Codespace, error) {
 	codespace, err := a.startCreate(ctx, params.RepositoryID, params.Machine, params.Branch, params.Location)
 	if err != errProvisioningInProgress {
-		return nil, err
+		return codespace, err
 	}
 
 	// errProvisioningInProgress indicates that codespace creation did not complete
diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go
index f9ab502d1..f238db10b 100644
--- a/pkg/cmd/extension/manager.go
+++ b/pkg/cmd/extension/manager.go
@@ -46,6 +46,7 @@ func NewManager(io *iostreams.IOStreams) *Manager {
 		platform: func() string {
 			return fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH)
 		},
+		io: io,
 	}
 }