2 files changed, 25 insertions, 20 deletions
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index 87c1abc0..742c643b 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -269,7 +269,7 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
 
         <span className="text-trueGray-400 ml-auto mr-4 text-xs">
           Highlight code to include as context.{" "}
-          {highlightedCodeSections.length > 0 &&
+          {highlightedCodeSections.length === 0 &&
             "Otherwise using entire currently open file."}
         </span>
       </div>
diff --git a/extension/react-app/src/tabs/gui.tsx b/extension/react-app/src/tabs/gui.tsx
index 973982ba..cccd184e 100644
--- a/extension/react-app/src/tabs/gui.tsx
+++ b/extension/react-app/src/tabs/gui.tsx
@@ -215,30 +215,35 @@ function GUI(props: GUIProps) {
       mainTextInputRef.current.value = "";
       if (!client) return;
 
+      setWaitingForSteps(true);
+
       if (
-        history?.timeline.length &&
-        history.timeline[history.current_index].step.name ===
-          "Waiting for user input"
+        history &&
+        history.current_index >= 0 &&
+        history.current_index < history.timeline.length
       ) {
-        if (input.trim() === "") return;
-        onStepUserInput(input, history!.current_index);
-      } else if (
-        history?.timeline.length &&
-        history.timeline[history.current_index].step.name ===
+        if (
+          history.timeline[history.current_index].step.name ===
+          "Waiting for user input"
+        ) {
+          if (input.trim() === "") return;
+          onStepUserInput(input, history!.current_index);
+          return;
+        } else if (
+          history.timeline[history.current_index].step.name ===
           "Waiting for user confirmation"
-      ) {
-        onStepUserInput("ok", history!.current_index);
-      } else {
-        if (input.trim() === "") return;
-
-        client.sendMainInput(input);
-        setUserInputQueue((queue) => {
-          return [...queue, input];
-        });
+        ) {
+          onStepUserInput("ok", history!.current_index);
+          return;
+        }
       }
-    }
+      if (input.trim() === "") return;
 
-    setWaitingForSteps(true);
+      client.sendMainInput(input);
+      setUserInputQueue((queue) => {
+        return [...queue, input];
+      });
+    }
   };
 
   const onStepUserInput = (input: string, index: number) => {