diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index c0c5c7dc4c7..22070275294 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -224,6 +224,9 @@ class ToggleChatModeAction extends Action2 {
 		context.chatWidget.input.setChatMode2(switchToMode);
 
 		if (chatModeCheck.needToClearSession) {
+			if (context.chatWidget.viewModel?.editing) {
+				context.chatWidget.input.dispose();
+			}
 			await commandService.executeCommand(ACTION_ID_NEW_CHAT);
 		}
 	}