diff --git a/src/web/waiters/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs
index 742ea516..0cd13212 100644
--- a/src/web/waiters/InputWaiter.mjs
+++ b/src/web/waiters/InputWaiter.mjs
@@ -348,6 +348,7 @@ class InputWaiter {
 
                 inputText.style.overflow = "auto";
                 inputText.classList.remove("blur");
+                inputText.scroll(0, 0);
 
                 const lines = inputData.input.length < (this.app.options.ioDisplayThreshold * 1024) ?
                     inputData.input.count("\n") + 1 : null;
diff --git a/src/web/waiters/OutputWaiter.mjs b/src/web/waiters/OutputWaiter.mjs
index a40cac30..9f922742 100755
--- a/src/web/waiters/OutputWaiter.mjs
+++ b/src/web/waiters/OutputWaiter.mjs
@@ -293,6 +293,7 @@ class OutputWaiter {
                 inputHighlighter.display = "none";
 
                 outputText.value = output.error;
+                outputText.scroll(0, 0);
                 outputHtml.innerHTML = "";
             } else if (output.status === "baked" || output.status === "inactive") {
                 document.querySelector("#output-loader .loading-msg").textContent = `Loading output ${inputNum}`;
@@ -326,6 +327,7 @@ class OutputWaiter {
 
                         outputText.value = "";
                         outputHtml.innerHTML = output.data.result;
+                        outputHtml.scroll(0, 0);
 
                         // Execute script sections
                         scriptElements = outputHtml.querySelectorAll("script");
@@ -358,6 +360,7 @@ class OutputWaiter {
                         inputHighlighter.display = "block";
 
                         outputText.value = Utils.printable(output.data.result, true);
+                        outputText.scroll(0, 0);
                         outputHtml.innerHTML = "";
 
                         lines = output.data.result.count("\n") + 1;