diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index ffde6f9095..4f817eef44 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -88,11 +88,3 @@ limitations under the License.
     */
     height: 100%;
 }
-
-.mx_MatrixChat .mx_RightPanel {
-    flex: 0 0 235px;
-}
-
-.mx_MatrixChat .mx_RightPanel.collapsed {
-    flex: 0 0 122px;
-}
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index b4dff612ed..e0fb95e99c 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -15,8 +15,10 @@ limitations under the License.
 */
 
 .mx_RightPanel {
+    overflow-x: hidden;
+    flex: 0 0 auto;
     position: relative;
-
+    min-width: 250px;
     display: flex;
     flex-direction: column;
 }