diff --git a/static/src/styles/components/chat/_chat-area.scss b/static/src/styles/components/chat/_chat-area.scss
index 95a66b8..b6070c7 100644
--- a/static/src/styles/components/chat/_chat-area.scss
+++ b/static/src/styles/components/chat/_chat-area.scss
@@ -100,6 +100,7 @@
   padding-bottom: 20px;
   min-height: 0;
   position: relative;
+  contain: layout style;
 }
 
 .messages-area.messages-area--stick {
@@ -113,6 +114,7 @@
   margin: 0 auto;
   display: flex;
   flex-direction: column;
+  contain: layout style;
 }
 
 .messages-bottom-spacer {
@@ -451,6 +453,8 @@
 .message-block {
   margin-bottom: 24px;
   min-width: 0;
+  content-visibility: auto;
+  contain-intrinsic-size: auto 300px;
 }
 
 .message-block.message-block--sub-agent-notice {