diff --git a/vscode/webviews/chat/cells/contextCell/ContextCell.tsx b/vscode/webviews/chat/cells/contextCell/ContextCell.tsx
index aedf6adb2115..947303ee5037 100644
--- a/vscode/webviews/chat/cells/contextCell/ContextCell.tsx
+++ b/vscode/webviews/chat/cells/contextCell/ContextCell.tsx
@@ -213,7 +213,8 @@ export const ContextCell: FunctionComponent<{
                                 <>
                                     <AccordionContent overflow={showSnippets}>
                                         <div className={styles.contextSuggestedActions}>
-                                            {contextItems && contextItems.length > 0 && (
+                                            {/* Temporarily disable the "Edit context" button because fetched ContextFiles aren't resolvable */}
+                                            {/* {contextItems && contextItems.length > 0 && (
                                                 <Button
                                                     size="sm"
                                                     variant="outline"
@@ -225,7 +226,7 @@ export const ContextCell: FunctionComponent<{
                                                 >
                                                     {editContextNode}
                                                 </Button>
-                                            )}
+                                            )} */}
                                             {resubmitWithRepoContext && (
                                                 <Button
                                                     size="sm"