diff --git a/aider/mdstream.py b/aider/mdstream.py
index 3ecb5079f..2788c2357 100755
--- a/aider/mdstream.py
+++ b/aider/mdstream.py
@@ -5,6 +5,8 @@ import time
 
 from rich.console import Console
 from rich.markdown import Markdown
+from rich.live import Live
+from rich.text import Text
 
 from aider.dump import dump  # noqa: F401
 
@@ -56,13 +58,20 @@ def showit(lines):
 
 
 class MarkdownStream:
+    live = None
+    when = 0
+    min_delay = 0.050
+    live_window = 6
+
     def __init__(self):
         self.printed = []
-        self.when = 0
 
-    def update(self, text, final=False, min_delay=0.100, mdargs=None):
+        self.live = Live(Text(''), refresh_per_second=1./self.min_delay)
+        self.live.start()
+
+    def update(self, text, final=False, mdargs=None):
         now = time.time()
-        if not final and now - self.when < min_delay:
+        if not final and now - self.when < self.min_delay:
             return
         self.when = now
 
@@ -79,34 +88,37 @@ class MarkdownStream:
 
         lines = output.splitlines(keepends=True)
         num_lines = len(lines)
+
         if not final:
-            num_lines -= 4
+            num_lines -= self.live_window
 
-        if num_lines <= 1 and not final:
-            return
+        if final or num_lines > 0:
 
-        num_printed = len(self.printed)
+            num_printed = len(self.printed)
 
-        """
-        if lines[:num_printed] != self.printed:
-            dump(repr(text))
-            print('xxx')
-            print(''.join(self.printed))
-            print('xxx')
-            print(''.join(lines))
-            print('xxx')
-            sys.exit()
-        """
+            show = num_lines - num_printed
 
-        show = num_lines - num_printed
+            if show <= 0:
+                return
 
-        if show <= 0:
-            return
+            show = lines[num_printed:num_lines]
+            show = ''.join(show)
+            show = Text.from_ansi(show)
+            self.live.console.print(show)
+
+            self.printed = lines[:num_lines]
+
+        if final:
+            self.live.update(Text(''))
+            self.live.stop()
+        else:
+            rest = lines[num_lines:]
+            rest = ''.join(rest)
+            #rest = '...\n' + rest
+            rest = Text.from_ansi(rest)
+            self.live.update(rest)
 
-        show = lines[num_printed:num_lines]
-        print("".join(show), end="")
 
-        self.printed = lines[:num_lines]
 
 
 if __name__ == "__main__":
@@ -115,6 +127,6 @@ if __name__ == "__main__":
     pm = MarkdownStream()
     for i in range(6, len(_text)):
         pm.update(_text[:i])
-        time.sleep(0.001)
+        time.sleep(0.01)
 
     pm.update(_text, final=True)