diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index edb16b5f4d0..4b842c07844 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1127,6 +1127,11 @@ export class Repository implements Disposable {
 			return undefined;
 		}
 
+		// Since we are inspecting the resource groups
+		// we have to ensure that the repository state
+		// is up to date
+		// await this.status();
+
 		// Ignore path that is inside a merge group
 		if (this.mergeGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
 			this.logger.trace(`[Repository][provideOriginalResource] Resource is part of a merge group: ${uri.toString()}`);
@@ -3295,6 +3300,11 @@ export class StagedResourceQuickDiffProvider implements QuickDiffProvider {
 			return undefined;
 		}
 
+		// Since we are inspecting the resource groups
+		// we have to ensure that the repository state
+		// is up to date
+		// await this._repository.status();
+
 		// Ignore resources that are not in the index group
 		if (!this._repository.indexGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
 			this.logger.trace(`[StagedResourceQuickDiffProvider][provideOriginalResource] Resource is not part of a index group: ${uri.toString()}`);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 5cc56bd9207..a4a9e1ba750 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -677,6 +677,9 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 				// Mark as no longer being modified
 				await entry.acceptStreamingEditsEnd();
 
+				// Accept the changes
+				await entry.accept();
+
 				// Clear external edit mode
 				entry.stopExternalEdit();
 			}