diff --git a/src/snek/static/message-list.js b/src/snek/static/message-list.js
index 8b60356..abe8e57 100644
--- a/src/snek/static/message-list.js
+++ b/src/snek/static/message-list.js
@@ -296,10 +296,11 @@ class MessageList extends HTMLElement {
       message = wrapper.firstElementChild;
       this.messageMap.set(data.uid, message);
       this._observer.observe(message);
+      this.endOfMessages.after(message);
     }
 
     const scrolledToBottom = this.isScrolledToBottom();
-    this.endOfMessages.after(message);
+
     if (scrolledToBottom) this.scrollToBottom(true);
   }
 }