diff --git a/src/Terminal/getTabCompletionPossibilities.ts b/src/Terminal/getTabCompletionPossibilities.ts
index efd20b974..fb84c8a0b 100644
--- a/src/Terminal/getTabCompletionPossibilities.ts
+++ b/src/Terminal/getTabCompletionPossibilities.ts
@@ -277,12 +277,18 @@ export async function getTabCompletionPossibilities(terminalText: string, baseDi
       return possibilities;
 
     default:
+      if (!onCommand) {
+        const options = await scriptAutocomplete();
+        if (options) {
+          addGeneric({ iterable: options, usePathing: false });
+        }
+      }
       return possibilities;
   }
 
   async function scriptAutocomplete(): Promise<string[] | undefined> {
     let inputCopy = commandArray.join(" ");
-    if (commandLength === 1) inputCopy = "run " + inputCopy;
+    if (commandLength >= 1 && commandArray[0] !== "run") inputCopy = "run " + inputCopy;
     const commands = parseCommands(inputCopy);
     if (commands.length === 0) return;
     const command = parseCommand(commands[commands.length - 1]);
diff --git a/src/Terminal/ui/TerminalInput.tsx b/src/Terminal/ui/TerminalInput.tsx
index 185b3e06d..e0dbee5ce 100644
--- a/src/Terminal/ui/TerminalInput.tsx
+++ b/src/Terminal/ui/TerminalInput.tsx
@@ -233,6 +233,9 @@ export function TerminalInput(): React.ReactElement {
 
     // Autocomplete
     if (event.key === KEY.TAB) {
+      if (event.altKey || event.ctrlKey) {
+        return;
+      }
       event.preventDefault();
       if (searchResults.length) {
         saveValue(searchResults[searchResultsIndex]);