diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 9597083e9c..5fa62e921d 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -20,6 +20,7 @@ limitations under the License.
     min-width: 0;
     height: 100%;
     justify-content: space-between;
+    min-height: 0;
 }
 
 .mx_MainSplit > .mx_RightPanel_ResizeWrapper {
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 28591ad7a4..b3dab5f992 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -135,14 +135,6 @@ limitations under the License.
     height: 50px;
 }
 
-.mx_RoomView_container {
-    position: relative; //for .mx_RoomView_auxPanel_fullHeight
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    min-width: 0;
-}
-
 .mx_RoomView_body {
     display: flex;
     flex-direction: column;
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 42eafe5bdc..be2f81a176 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -2058,24 +2058,22 @@ export default class RoomView extends React.Component<IProps, IState> {
                             appsShown={this.state.showApps}
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
-                            <div className="mx_RoomView_container">
+                            <div className="mx_RoomView_body">
                                 {auxPanel}
-                                <div className="mx_RoomView_body">
-                                    <div className={timelineClasses}>
-                                        {topUnreadMessagesBar}
-                                        {jumpToBottom}
-                                        {messagePanel}
-                                        {searchResultsPanel}
-                                    </div>
-                                    <div className={statusBarAreaClass}>
-                                        <div className="mx_RoomView_statusAreaBox">
-                                            <div className="mx_RoomView_statusAreaBox_line" />
-                                            {statusBar}
-                                        </div>
-                                    </div>
-                                    {previewBar}
-                                    {messageComposer}
+                                <div className={timelineClasses}>
+                                    {topUnreadMessagesBar}
+                                    {jumpToBottom}
+                                    {messagePanel}
+                                    {searchResultsPanel}
                                 </div>
+                                <div className={statusBarAreaClass}>
+                                    <div className="mx_RoomView_statusAreaBox">
+                                        <div className="mx_RoomView_statusAreaBox_line" />
+                                        {statusBar}
+                                    </div>
+                                </div>
+                                {previewBar}
+                                {messageComposer}
                             </div>
                         </MainSplit>
                     </ErrorBoundary>