diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 8812ba4302..6d618d0b9d 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -230,6 +230,7 @@ class FilePanel extends React.Component {
                     className="mx_FilePanel"
                     onClose={this.props.onClose}
                     previousPhase={RightPanelPhases.RoomSummary}
+                    withoutScrollContainer
                 >
                     <TimelinePanel
                         manageReadReceipts={false}
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index a561ade799..2889afc1fc 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -60,7 +60,7 @@ class NotificationPanel extends React.Component {
             content = <Loader />;
         }
 
-        return <BaseCard className="mx_NotificationPanel" onClose={this.props.onClose}>
+        return <BaseCard className="mx_NotificationPanel" onClose={this.props.onClose} withoutScrollContainer>
             { content }
         </BaseCard>;
     }
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index daa18bb290..97f9ba48ed 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -104,8 +104,8 @@ class TimelinePanel extends React.Component {
         // shape property to be passed to EventTiles
         tileShape: PropTypes.string,
 
-        // placeholder text to use if the timeline is empty
-        empty: PropTypes.string,
+        // placeholder to use if the timeline is empty
+        empty: PropTypes.node,
 
         // whether to show reactions for an event
         showReactions: PropTypes.bool,