1 files changed, 8 insertions, 0 deletions
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index 982c42d1..5eada708 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -379,6 +379,14 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
                   Math.min(prev + 1, history.length)
                 );
                 setCurrentlyInContextQuery(false);
+              } else if (event.key === "Escape") {
+                setCurrentlyInContextQuery(false);
+                if (downshiftProps.isOpen) {
+                  downshiftProps.closeMenu();
+                } else {
+                  // Move cursor back over to the editor
+                  postVscMessage("focusEditor", {});
+                }
               }
             },
             onClick: () => {