From 297fd0a74a3a6f8c372b684874a0d052825176f2 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 2 Mar 2026 12:35:37 -0500 Subject: [PATCH 1/2] fixes #294109 --- .../contrib/chat/browser/chatEditing/chatEditingActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts index 2e6371ba031606..a446e17904fee1 100644 --- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts +++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts @@ -515,7 +515,7 @@ registerAction2(class RemoveAction extends Action2 { mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace, }, - when: ContextKeyExpr.and(ChatContextKeys.inChatSession, EditorContextKeys.textInputFocus.negate()), + when: ContextKeyExpr.and(ChatContextKeys.inChatSession, EditorContextKeys.textInputFocus.negate(), ChatContextKeys.inChatQuestionCarousel.negate()), weight: KeybindingWeight.WorkbenchContrib, }, menu: [ From 50140189eca32ced3a580d230926e832195dcb23 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 2 Mar 2026 12:41:46 -0500 Subject: [PATCH 2/2] add when --- .../contrib/chat/browser/chatEditing/chatEditingActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts index a446e17904fee1..1f021914c0b2e9 100644 --- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts +++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts @@ -564,7 +564,7 @@ registerAction2(class RestoreCheckpointAction extends Action2 { mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace, }, - when: ContextKeyExpr.and(ChatContextKeys.inChatSession, EditorContextKeys.textInputFocus.negate()), + when: ContextKeyExpr.and(ChatContextKeys.inChatSession, EditorContextKeys.textInputFocus.negate(), ChatContextKeys.inChatQuestionCarousel.negate()), weight: KeybindingWeight.WorkbenchContrib, }, menu: [