diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 6c28f9578621ad701f984ea0868746348ff11054..15474e3339a5e1ecb436090b99fde5909781b5c7 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -1273,7 +1273,7 @@ declare module 'vscode' {
 		 * in an operation that takes time to complete, your extension may decide to finish the ongoing backup rather
 		 * than cancelling it to ensure that VS Code has some valid backup.
 		 */
-		backup(cancellation: CancellationToken): Thenable<boolean>;
+		backup(cancellation: CancellationToken): Thenable<void>;
 	}
 
 	/**
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index a54b3d0766aee2055f3f7e161483d3b2e8306ded..10f51d2354888f1dc54d38673d9530f4d3bc94db 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -620,7 +620,7 @@ export interface ExtHostWebviewsShape {
 	$onSave(resource: UriComponents, viewType: string): Promise<void>;
 	$onSaveAs(resource: UriComponents, viewType: string, targetResource: UriComponents): Promise<void>;
 
-	$backup(resource: UriComponents, viewType: string, cancellation: CancellationToken): Promise<boolean>;
+	$backup(resource: UriComponents, viewType: string, cancellation: CancellationToken): Promise<void>;
 }
 
 export interface MainThreadUrlsShape extends IDisposable {
diff --git a/src/vs/workbench/api/common/extHostWebview.ts b/src/vs/workbench/api/common/extHostWebview.ts
index 539f31df1c272c1795787315130822b1951f57e6..cfac95a00b3bfa4d08ba2ea37f1d258421a7a15f 100644
--- a/src/vs/workbench/api/common/extHostWebview.ts
+++ b/src/vs/workbench/api/common/extHostWebview.ts
@@ -727,7 +727,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		return document._saveAs(URI.revive(targetResource));
 	}
 
-	async $backup(resourceComponents: UriComponents, viewType: string, cancellation: CancellationToken): Promise<boolean> {
+	async $backup(resourceComponents: UriComponents, viewType: string, cancellation: CancellationToken): Promise<void> {
 		const document = this.getDocument(viewType, resourceComponents);
 		return document._backup(cancellation);
 	}
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
index a0e84261e3ae62d4ad8fc1dfc6f767897a9292bd..f14ffcf0a813f717c2f6116768864452ab654d73 100644
--- a/src/vs/workbench/contrib/customEditor/common/customEditor.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -74,7 +74,7 @@ export interface ICustomEditorModel extends IWorkingCopy {
 	readonly onWillSave: Event<CustomEditorSaveEvent>;
 	readonly onWillSaveAs: Event<CustomEditorSaveAsEvent>;
 
-	onBackup(f: () => CancelablePromise<boolean>): void;
+	onBackup(f: () => CancelablePromise<void>): void;
 
 	setDirty(dirty: boolean): void;
 	undo(): void;
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts b/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts
index 6adac4c6199586c9ee206c3a19e27712f032c62d..43f887a82a00484cf3f07ab984408659d4b6f460 100644
--- a/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customEditorModel.ts
@@ -29,7 +29,7 @@ namespace HotExitState {
 		readonly type = Type.Pending;
 
 		constructor(
-			public readonly operation: CancelablePromise<boolean>,
+			public readonly operation: CancelablePromise<void>,
 		) { }
 	}
 
@@ -90,9 +90,9 @@ export class CustomEditorModel extends Disposable implements ICustomEditorModel
 	private readonly _onWillSaveAs = this._register(new Emitter<CustomEditorSaveAsEvent>());
 	public readonly onWillSaveAs = this._onWillSaveAs.event;
 
-	private _onBackup: undefined | (() => CancelablePromise<boolean>);
+	private _onBackup: undefined | (() => CancelablePromise<void>);
 
-	public onBackup(f: () => CancelablePromise<boolean>) {
+	public onBackup(f: () => CancelablePromise<void>) {
 		if (this._onBackup) {
 			throw new Error('Backup already implemented');
 		}
@@ -182,7 +182,11 @@ export class CustomEditorModel extends Disposable implements ICustomEditorModel
 		this._hotExitState = pendingState;
 
 		try {
-			this._hotExitState = await pendingState.operation ? HotExitState.Allowed : HotExitState.NotAllowed;
+			await pendingState.operation;
+			// Make sure state has not changed in the meantime
+			if (this._hotExitState === pendingState) {
+				this._hotExitState = HotExitState.Allowed;
+			}
 		} catch (e) {
 			// Make sure state has not changed in the meantime
 			if (this._hotExitState === pendingState) {