diff --git a/src/gui/Base/HDrawer.qml b/src/gui/Base/HDrawer.qml
index e028880d..f1105036 100644
--- a/src/gui/Base/HDrawer.qml
+++ b/src/gui/Base/HDrawer.qml
@@ -44,9 +44,7 @@ Drawer {
 
     property int minimumSize: resizeAreaSize
     property int maximumSize:
-        horizontal ?
-        referenceSizeParent.width - theme.minimumSupportedWidth :
-        referenceSizeParent.height - theme.minimumSupportedHeight
+        horizontal ? referenceSizeParent.width : referenceSizeParent.height
 
     //
 
diff --git a/src/gui/Pages/Chat/Chat.qml b/src/gui/Pages/Chat/Chat.qml
index 4daef705..d3d702fc 100644
--- a/src/gui/Pages/Chat/Chat.qml
+++ b/src/gui/Pages/Chat/Chat.qml
@@ -53,9 +53,11 @@ Item {
     HLoader {
         id: roomPaneLoader
         active: ready
+
         sourceComponent: RoomPane {
             id: roomPane
             referenceSizeParent: chat
+            maximumSize: chat.width - theme.minimumSupportedWidth
         }
     }
 }
diff --git a/src/gui/Pages/Chat/ChatPage.qml b/src/gui/Pages/Chat/ChatPage.qml
index f1e699ea..8c525077 100644
--- a/src/gui/Pages/Chat/ChatPage.qml
+++ b/src/gui/Pages/Chat/ChatPage.qml
@@ -31,7 +31,6 @@ HPage {
         id: eventList
 
         // Avoid a certain binding loop
-        Layout.minimumWidth: theme.minimumSupportedWidth
         Layout.fillWidth: true
         Layout.fillHeight: true
     }
diff --git a/src/gui/UI.qml b/src/gui/UI.qml
index 1969b988..7426bd35 100644
--- a/src/gui/UI.qml
+++ b/src/gui/UI.qml
@@ -70,6 +70,7 @@ Item {
 
     MainPane {
         id: mainPane
+        maximumSize: parent.width - theme.minimumSupportedWidth
     }
 
     PageLoader {