diff --git a/src/skins/vector/css/matrix-react-sdk/structures/FilePanel.css b/src/skins/vector/css/matrix-react-sdk/structures/FilePanel.css
index 2d2fe31c85..fca53b1d2a 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/FilePanel.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/FilePanel.css
@@ -47,6 +47,10 @@ limitations under the License.
 
 /* Overrides for the attachment body tiles */
 
+.mx_FilePanel .mx_EventTile {
+    word-break: break-word;
+}
+
 .mx_FilePanel .mx_EventTile .mx_MImageBody {
     margin-right: 0px;
 }
@@ -60,7 +64,6 @@ limitations under the License.
 .mx_FilePanel .mx_EventTile .mx_MImageBody_downloadLink {
     flex: 1 1 auto;
     color: #747474;
-    word-wrap: break-word;
 }
 
 .mx_FilePanel .mx_EventTile .mx_MImageBody_size {
@@ -88,7 +91,6 @@ limitations under the License.
     font-size: 11px;
     opacity: 1.0;
     color: #acacac;
-    word-wrap: break-word;
 }
 
 .mx_FilePanel .mx_EventTile .mx_MessageTimestamp {
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/NotificationPanel.css b/src/skins/vector/css/matrix-react-sdk/structures/NotificationPanel.css
index 36d62a8177..83b0a033b7 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/NotificationPanel.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/NotificationPanel.css
@@ -41,10 +41,13 @@ limitations under the License.
    we should make EventTile a base CSS class and customise it specifically
    for usage in {Message,File,Notification}Panel. */
 
+.mx_NotificationPanel .mx_EventTile {
+    word-break: break-word;
+}
+
 .mx_NotificationPanel .mx_EventTile_roomName {
     font-weight: bold;
     font-size: 14px;
-    word-wrap: break-word;
 }
 
 .mx_NotificationPanel .mx_EventTile_roomName a {
@@ -63,7 +66,6 @@ limitations under the License.
     font-size: 12px;
     display: inline;
     padding-left: 0px;
-    word-wrap: break-word;
 }
 
 .mx_NotificationPanel .mx_EventTile_senderDetails {