diff --git a/extensions/git/src/editSessionIdentityProvider.ts b/extensions/git/src/editSessionIdentityProvider.ts
index 8e172f2d17418..8380f03ecfd94 100644
--- a/extensions/git/src/editSessionIdentityProvider.ts
+++ b/extensions/git/src/editSessionIdentityProvider.ts
@@ -16,7 +16,13 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
 		this.providerRegistration = vscode.Disposable.from(
 			vscode.workspace.registerEditSessionIdentityProvider('file', this),
 			vscode.workspace.onWillCreateEditSessionIdentity((e) => {
-				e.waitUntil(this._onWillCreateEditSessionIdentity(e.workspaceFolder));
+				e.waitUntil(
+					this._onWillCreateEditSessionIdentity(e.workspaceFolder).catch(err => {
+						if (err instanceof vscode.CancellationError) {
+							throw err;
+						}
+					})
+				);
 			})
 		);
 	}