diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index da17e5f1f9..fced77bac8 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -26,6 +26,8 @@ $roomListCollapsedWidth: 68px;
 .mx_LeftPanel_wrapper {
     display: flex;
     max-width: 50%;
+    // Contain the amount of layers rendered by constraining what actually needs re-layering via css
+    contain: layout paint;
 
     .mx_LeftPanel_wrapper--user {
         background-color: $roomlist-bg-color;
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 81ea75c442..67529878c9 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -20,6 +20,8 @@ limitations under the License.
     flex: 1;
     position: relative;
     justify-content: center;
+    // Contain the amount of layers rendered by constraining what actually needs re-layering via css
+    contain: strict;
 }
 
 .mx_RoomView {
@@ -163,7 +165,6 @@ limitations under the License.
     flex: 1;
     display: flex;
     flex-direction: column;
-    contain: content;
 }
 
 .mx_RoomView_statusArea {
diff --git a/res/css/structures/_ScrollPanel.scss b/res/css/structures/_ScrollPanel.scss
index 7b75c69e86..82caeae29d 100644
--- a/res/css/structures/_ScrollPanel.scss
+++ b/res/css/structures/_ScrollPanel.scss
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 .mx_ScrollPanel {
+    contain: strict;
 
     .mx_RoomView_MessageList {
         position: relative;