diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index 3f9c6fb02a28654e14bc711e9b96ea3692a3ff1d..b07729cf2fc85112dfb35a40c9a212bcb9060208 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -62,7 +62,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
 
         // SideBar
         sideBar_ = new QFrame(this);
-        sideBar_->setMinimumSize(QSize(ui::sidebar::NormalSize, 0));
+        sideBar_->setMinimumSize(QSize(ui::sidebar::NormalSize, parent->height()));
         sideBarLayout_ = new QVBoxLayout(sideBar_);
         sideBarLayout_->setSpacing(0);
         sideBarLayout_->setMargin(0);
@@ -93,6 +93,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
         // Splitter
         splitter->addWidget(sideBar_);
         splitter->addWidget(content_);
+        splitter->setSizes({ui::sidebar::NormalSize, parent->width() - ui::sidebar::NormalSize});
 
         text_input_    = new TextInputWidget(this);
         typingDisplay_ = new TypingDisplay(this);
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index 9653897da8dc80fea39e960e30052a4de491dbd4..c5735b68e0d337011d7416db3eb5c7d9ef016452 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -41,14 +41,11 @@ MainWindow::MainWindow(QWidget *parent)
   , progressModal_{nullptr}
   , spinner_{nullptr}
 {
-        QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-        setSizePolicy(sizePolicy);
         setWindowTitle("nheko");
         setObjectName("MainWindow");
         setStyleSheet("QWidget#MainWindow {background-color: #fff}");
 
         restoreWindowSize();
-        setMinimumSize(QSize(conf::window::minWidth, conf::window::minHeight));
 
         QFont font("Open Sans");
         font.setPixelSize(conf::fontSize);