diff --git a/css/main.css b/css/main.css
index 3ed2efbd..67d705b1 100644
--- a/css/main.css
+++ b/css/main.css
@@ -415,7 +415,13 @@ audio {
     text-align: start;
     padding-left: 1rem;
     padding-right: 1rem;
-    contain: layout;
+    contain: layout paint;
+}
+
+.message,
+.user-message,
+.assistant-message {
+    contain: layout paint;
 }
 
 .chat .message .timestamp {
@@ -1827,14 +1833,9 @@ button:focus {
 }
 
 .chat-parent {
-    /* Optimize for scrolling performance */
     will-change: scroll-position;
-    contain: style paint;
-
-    /* Ensure GPU acceleration */
+    contain: style;
     transform: translateZ(0);
-
-    /* Prevent layout shifts */
     overflow-anchor: none;
 }