diff --git a/mitmproxy/console/__init__.py b/mitmproxy/console/__init__.py
index f7e7b0d5a..16615cbc8 100644
--- a/mitmproxy/console/__init__.py
+++ b/mitmproxy/console/__init__.py
@@ -50,7 +50,7 @@ class ConsoleState(flow.State):
         if self.focus is None:
             self.set_focus(0)
         elif self.follow_focus:
-            self.set_focus(len(self.view) - 1)
+            self.update_focus()
         self.set_flow_marked(f, False)
         return f
 
@@ -58,6 +58,8 @@ class ConsoleState(flow.State):
         super(ConsoleState, self).update_flow(f)
         if self.focus is None:
             self.set_focus(0)
+        elif self.follow_focus:
+            self.update_focus()
         return f
 
     def set_limit(self, limit):
@@ -80,6 +82,9 @@ class ConsoleState(flow.State):
         else:
             self.focus = None
 
+    def update_focus(self):
+        self.set_focus(len(self.view) - 1)
+
     def set_focus_flow(self, f):
         self.set_focus(self.view.index(f))