diff --git a/renderdocui/Windows/Dialogs/PythonShell.cs b/renderdocui/Windows/Dialogs/PythonShell.cs
index 4414dfceb..4bdec3354 100644
--- a/renderdocui/Windows/Dialogs/PythonShell.cs
+++ b/renderdocui/Windows/Dialogs/PythonShell.cs
@@ -335,6 +335,8 @@ namespace renderdocui.Windows.Dialogs
             this.BeginInvoke(new Action(() =>
             {
                 scriptOutput.Text += output;
+                scriptOutput.SelectionStart = scriptOutput.TextLength;
+                scriptOutput.ScrollToCaret();
             }));
         }
         }
@@ -406,6 +408,8 @@ namespace renderdocui.Windows.Dialogs
                     pythonThread = null;
 
                     scriptOutput.Text += output;
+                    scriptOutput.SelectionStart = scriptOutput.TextLength;
+                    scriptOutput.ScrollToCaret();
 
                     SetLineNumber(linenum);