diff --git a/vscode/webviews/chat/cells/messageCell/human/editor/toolbar/Toolbar2.tsx b/vscode/webviews/chat/cells/messageCell/human/editor/toolbar/Toolbar2.tsx
index 92e34a6c1503..7ccc7b6a3715 100644
--- a/vscode/webviews/chat/cells/messageCell/human/editor/toolbar/Toolbar2.tsx
+++ b/vscode/webviews/chat/cells/messageCell/human/editor/toolbar/Toolbar2.tsx
@@ -153,6 +153,10 @@ const ModelSelectFieldToolbarItem: FunctionComponent<{
                 api.setChatModel(model.id).subscribe({
                     error: error => console.error('setChatModel:', error),
                 })
+                // KLUDGE(beyang)
+                api.setAgent('model').subscribe({
+                    error: error => console.error('setAgent:', error),
+                })
             } else {
                 api.setAgent(agent.id).subscribe({
                     error: error => console.error('setAgent:', error),