diff --git a/res/css/structures/_SpacePanel.pcss b/res/css/structures/_SpacePanel.pcss
index 6517aec5e1..e62a6c90a1 100644
--- a/res/css/structures/_SpacePanel.pcss
+++ b/res/css/structures/_SpacePanel.pcss
@@ -379,11 +379,16 @@ $activeBorderColor: $primary-content;
 }
 
 .mx_SpacePanel_contextMenu {
+    max-width: 360px;
+
     .mx_SpacePanel_contextMenu_header {
         margin: 12px 16px 12px;
         font-weight: $font-semi-bold;
         font-size: $font-15px;
         line-height: $font-18px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
 
     .mx_SpacePanel_iconHome::before {
diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss
index b39f57cbb0..2664549b17 100644
--- a/res/css/structures/_SpaceRoomView.pcss
+++ b/res/css/structures/_SpaceRoomView.pcss
@@ -177,6 +177,10 @@ $SpaceRoomViewInnerWidth: 428px;
 
                 h1 {
                     display: inline-block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    width: 100%;
                 }
             }