diff --git a/src/lime_qt/configuration/configure_layout.cpp b/src/lime_qt/configuration/configure_layout.cpp
index 187865647..64f9c905e 100644
--- a/src/lime_qt/configuration/configure_layout.cpp
+++ b/src/lime_qt/configuration/configure_layout.cpp
@@ -25,9 +25,19 @@ ConfigureLayout::ConfigureLayout(QWidget* parent)
     connect(ui->layout_combobox,
             static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
             [this](int currentIndex) {
-                ui->custom_layout_group->setEnabled(ui->layout_combobox->currentIndex() == 6);
+                ui->custom_layout_group->setEnabled(ui->layout_combobox->currentIndex() ==
+                                                    (uint)(Settings::LayoutOption::CustomLayout));
             });
 
+    ui->large_screen_proportion->setEnabled(
+        (Settings::values.layout_option.GetValue() == Settings::LayoutOption::LargeScreen));
+    connect(
+        ui->layout_combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        this, [this](int currentIndex) {
+            ui->large_screen_proportion->setEnabled(ui->layout_combobox->currentIndex() ==
+                                                    (uint)(Settings::LayoutOption::LargeScreen));
+        });
+
     connect(ui->bg_button, &QPushButton::clicked, this, [this] {
         const QColor new_bg_color = QColorDialog::getColor(bg_color);
         if (!new_bg_color.isValid()) {