diff --git a/src/extension/inlineEdits/node/nextEditProvider.ts b/src/extension/inlineEdits/node/nextEditProvider.ts
index 8725ac96a9..62c6bd6a28 100644
--- a/src/extension/inlineEdits/node/nextEditProvider.ts
+++ b/src/extension/inlineEdits/node/nextEditProvider.ts
@@ -305,13 +305,15 @@ export class NextEditProvider extends Disposable implements INextEditProvider<Ne
 		assert(currentDocument !== undefined, 'should be defined if edit is defined');
 
 		telemetryBuilder.setStatus('notAccepted'); // Acceptance pending.
+
 		const showRangePreference = this._statelessNextEditProvider.showNextEditPreference ?? ShowNextEditPreference.AroundEdit;
+
 		let nextEditResult: NextEditResult;
-		if (!showLabel || selections.length < 1) {
+		const currentSelection = selections.at(0);
+		if (!showLabel || currentSelection === undefined) {
 			nextEditResult = new NextEditResult(logContext.requestId, req, { edit, showRangePreference, documentBeforeEdits: currentDocument, targetDocumentId });
 		} else {
 			const transformer = documentAtInvocationTime.getTransformer();
-			const currentSelection = selections[0];
 			const currentCursorPosition = transformer.getRange(currentSelection);
 
 			const editPosition = transformer.getRange(edit.replaceRange);
@@ -325,6 +327,7 @@ export class NextEditProvider extends Disposable implements INextEditProvider<Ne
 			const displayLocation: INextEditDisplayLocation = {
 				label,
 				range: currentCursorPosition,
+				jumpToEdit: true,
 			};
 
 			const commandJumpToEditRange: vscode.Command = {
diff --git a/src/extension/inlineEdits/node/nextEditResult.ts b/src/extension/inlineEdits/node/nextEditResult.ts
index 1097cb1765..3a0e33620b 100644
--- a/src/extension/inlineEdits/node/nextEditResult.ts
+++ b/src/extension/inlineEdits/node/nextEditResult.ts
@@ -14,6 +14,7 @@ import { NextEditFetchRequest } from './nextEditProvider';
 export interface INextEditDisplayLocation {
 	range: Range;
 	label: string;
+	jumpToEdit?: boolean;
 }
 
 export interface INextEditResult {
diff --git a/src/extension/inlineEdits/vscode-node/inlineCompletionProvider.ts b/src/extension/inlineEdits/vscode-node/inlineCompletionProvider.ts
index f25a9166bd..69ced60cb5 100644
--- a/src/extension/inlineEdits/vscode-node/inlineCompletionProvider.ts
+++ b/src/extension/inlineEdits/vscode-node/inlineCompletionProvider.ts
@@ -366,7 +366,8 @@ export class InlineCompletionProviderImpl implements InlineCompletionItemProvide
 		const displayLocation: InlineCompletionDisplayLocation | undefined = result.displayLocation && displayLocationRange ? {
 			range: displayLocationRange,
 			label: result.displayLocation.label,
-			kind: InlineCompletionDisplayLocationKind.Code
+			kind: InlineCompletionDisplayLocationKind.Code,
+			jumpToEdit: result.displayLocation.jumpToEdit
 		} : undefined;
 
 
diff --git a/src/extension/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/extension/vscode.proposed.inlineCompletionsAdditions.d.ts
index 039555e360..1bc799422b 100644
--- a/src/extension/vscode.proposed.inlineCompletionsAdditions.d.ts
+++ b/src/extension/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -60,6 +60,7 @@ declare module 'vscode' {
 		range: Range;
 		kind: InlineCompletionDisplayLocationKind;
 		label: string;
+		jumpToEdit?: boolean;
 	}
 
 	export interface InlineCompletionWarning {
diff --git a/src/extension/xtab/node/xtabProvider.ts b/src/extension/xtab/node/xtabProvider.ts
index 09a55873a7..a983c07d6d 100644
--- a/src/extension/xtab/node/xtabProvider.ts
+++ b/src/extension/xtab/node/xtabProvider.ts
@@ -759,7 +759,9 @@ export class XtabProvider implements IStatelessNextEditProvider {
 		}
 
 		const diffOptions: ResponseProcessor.DiffParams = {
-			emitFastCursorLineChange: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabProviderEmitFastCursorLineChange, this.expService),
+			emitFastCursorLineChange: opts.showLabel
+				? false
+				: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabProviderEmitFastCursorLineChange, this.expService),
 			nLinesToConverge: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabNNonSignificantLinesToConverge, this.expService),
 			nSignificantLinesToConverge: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabNSignificantLinesToConverge, this.expService),
 		};