diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
index c9a2f4051eb9b..107f60f28cecd 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
@@ -13,7 +13,7 @@ export function resolveContentAndKeybindingItems(keybindingService: IKeybindingS
 	}
 	const configureKeybindingItems: IPickerQuickAccessItem[] = [];
 	const configuredKeybindingItems: IPickerQuickAccessItem[] = [];
-	const matches = value.matchAll(/\<keybinding:(?<commandId>.*)\>/gm);
+	const matches = value.matchAll(/(\<keybinding:(?<commandId>[^\<]*)\>)/gm);
 	for (const match of [...matches]) {
 		const commandId = match?.groups?.commandId;
 		let kbLabel;
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index afa69a9663295..7a7a9f93f7241 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -44,7 +44,7 @@ export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat'): stri
 	} else {
 		content.push(localize('inlineChat.overview', "Inline chat occurs within a code editor and takes into account the current selection. It is useful for making changes to the current editor. For example, fixing diagnostics, documenting or refactoring code. Keep in mind that AI generated code may be incorrect."));
 		content.push(localize('inlineChat.access', "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.", '<keybinding:inlineChat.start>'));
-		content.push(localize('inlineChat.requestHistory', 'In the input box, use{0} and{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.', '<keybinding:inlineChat.previousFromHistory>', '<keybinding:inlineChat.nextFromHistory>'));
+		content.push(localize('inlineChat.requestHistory', 'In the input box, use Show Previous{0} and Show Next{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.', '<keybinding:history.showPrevious>', '<keybinding:history.showNext>'));
 		content.push(localize('inlineChat.inspectResponse', 'In the input box, inspect the response in the accessible view{0}.', '<keybinding:editor.action.accessibleView>'));
 		content.push(localize('inlineChat.contextActions', "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."));
 		content.push(localize('inlineChat.fix', "If a fix action is invoked, a response will indicate the problem with the current code. A diff editor will be rendered and can be reached by tabbing."));
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
index efaf3983a26b1..c1c415541e8a8 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
@@ -33,14 +33,14 @@ export class NotebookAccessibilityHelp implements IAccessibleViewImplentation {
 export function getAccessibilityHelpText(): string {
 	return [
 		localize('notebook.overview', 'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'),
-		localize('notebook.cell.edit', 'The Edit Cell command<keybinding:notebook.cell.edit> will focus on the cell input.'),
-		localize('notebook.cell.quitEdit', 'The Quit Edit command<keybinding:notebook.cell.quitEdit> will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.'),
-		localize('notebook.cell.focusInOutput', 'The Focus Output command<keybinding:notebook.cell.focusInOutput> will set focus in the cell\'s output.'),
-		localize('notebook.focusNextEditor', 'The Focus Next Cell Editor command<keybinding:notebook.focusNextEditor> will set focus in the next cell\'s editor.'),
-		localize('notebook.focusPreviousEditor', 'The Focus Previous Cell Editor command<keybinding:notebook.focusPreviousEditor> will set focus in the previous cell\'s editor.'),
+		localize('notebook.cell.edit', 'The Edit Cell command{0} will focus on the cell input.', '<keybinding:notebook.cell.edit>'),
+		localize('notebook.cell.quitEdit', 'The Quit Edit command{0} will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.', '<keybinding:notebook.cell.quitEdit>'),
+		localize('notebook.cell.focusInOutput', 'The Focus Output command{0} will set focus in the cell\'s output.', '<keybinding:notebook.cell.focusInOutput>'),
+		localize('notebook.focusNextEditor', 'The Focus Next Cell Editor command{0} will set focus in the next cell\'s editor.', '<keybinding:notebook.focusNextEditor>'),
+		localize('notebook.focusPreviousEditor', 'The Focus Previous Cell Editor command{0} will set focus in the previous cell\'s editor.', '<keybinding:notebook.focusPreviousEditor>'),
 		localize('notebook.cellNavigation', 'The up and down arrows will also move focus between cells while focused on the outer cell container.'),
-		localize('notebook.cell.executeAndFocusContainer', 'The Execute Cell command<keybinding:notebook.cell.executeAndFocusContainer> executes the cell that currently has focus.',),
-		localize('notebook.cell.insertCodeCellBelowAndFocusContainer', 'The Insert Cell Above/Below commands will create new empty code cells.'),
+		localize('notebook.cell.executeAndFocusContainer', 'The Execute Cell command{0} executes the cell that currently has focus.', '<keybinding:notebook.cell.executeAndFocusContainer>'),
+		localize('notebook.cell.insertCodeCellBelowAndFocusContainer', 'The Insert Cell Above{0} and Below{1} commands will create new empty code cells.', '<keybinding:notebook.cell.insertCodeCellAbove>', '<keybinding:notebook.cell.insertCodeCellBelow>'),
 		localize('notebook.changeCellType', 'The Change Cell to Code/Markdown commands are used to switch between cell types.')
 	].join('\n');
 }