diff --git a/src/app/editorgrid.ts b/src/app/editorgrid.ts
index 859cf82..0b906d7 100644
--- a/src/app/editorgrid.ts
+++ b/src/app/editorgrid.ts
@@ -54,6 +54,9 @@ export function addTerminal() {
     const term = new Terminal();
     editors[currentTab.val].push(vanX.noreactive(term));
     term.focus();
+    setTimeout(() => {
+        term.focus();
+    }, 0);
 }
 
 const TabHeader = (tab: State<Editor[]>, del: () => void, k: number) =>
diff --git a/src/app/terminal.ts b/src/app/terminal.ts
index ec2822b..231076d 100644
--- a/src/app/terminal.ts
+++ b/src/app/terminal.ts
@@ -61,7 +61,7 @@ export class Terminal implements Displayable {
                 this.terminalId,
                 (exitCode) => {
                     this.term.writeln(
-                        `\r\n[Process exited with code ${exitCode}]\n"Press any key to close..."`,
+                        `\r\n[Process exited with code ${exitCode}]\r\nPress any key to close...`,
                     );
 
                     this.term.onData(() => this.close());
@@ -108,6 +108,7 @@ export class Terminal implements Displayable {
     }
 
     focus() {
+        this.dom.scrollIntoView();
         this.term.focus();
     }