diff --git a/app/layoutconfigdialog.cpp b/app/layoutconfigdialog.cpp
index a1d6923c2..edcf1b290 100644
--- a/app/layoutconfigdialog.cpp
+++ b/app/layoutconfigdialog.cpp
@@ -28,6 +28,11 @@ Latte::LayoutConfigDialog::LayoutConfigDialog(QWidget* parent)
     ui->setupUi(this);
 
     setAttribute(Qt::WA_DeleteOnClose, true);
+
+    connect(ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked
+    , this, &LayoutConfigDialog::apply);
+    connect(ui->buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked
+    , this, &LayoutConfigDialog::restoreDefaults);
 }
 
 Latte::LayoutConfigDialog::~LayoutConfigDialog()
@@ -55,22 +60,26 @@ void Latte::LayoutConfigDialog::on_exportButton_clicked()
     qDebug() << Q_FUNC_INFO;
 }
 
-void Latte::LayoutConfigDialog::on_okButton_clicked()
+void Latte::LayoutConfigDialog::accept()
 {
     qDebug() << Q_FUNC_INFO;
+
+    setVisible(false);
 }
 
-void Latte::LayoutConfigDialog::on_applyButton_cliked()
+void Latte::LayoutConfigDialog::reject()
 {
     qDebug() << Q_FUNC_INFO;
+
+    setVisible(false);
 }
 
-void Latte::LayoutConfigDialog::on_cancelButton_clicked()
+void Latte::LayoutConfigDialog::apply()
 {
     qDebug() << Q_FUNC_INFO;
 }
 
-void Latte::LayoutConfigDialog::on_resetButton_clicked()
+void Latte::LayoutConfigDialog::restoreDefaults()
 {
     qDebug() << Q_FUNC_INFO;
 }
diff --git a/app/layoutconfigdialog.h b/app/layoutconfigdialog.h
index bca088991..25ae8d8fb 100644
--- a/app/layoutconfigdialog.h
+++ b/app/layoutconfigdialog.h
@@ -41,16 +41,16 @@ public:
     ~LayoutConfigDialog();
 
 private slots:
+    // auto connections
     void on_copyButton_clicked();
     void on_removeButton_clicked();
     void on_importButton_clicked();
     void on_exportButton_clicked();
 
-    void on_okButton_clicked();
-    void on_applyButton_cliked();
-    void on_cancelButton_clicked();
-    void on_resetButton_clicked();
-
+    void accept() override;
+    void reject() override;
+    void apply();
+    void restoreDefaults();
 
 private:
     Ui::LayoutConfigDialog* ui;
diff --git a/app/layoutconfigdialog.ui b/app/layoutconfigdialog.ui
index b855defcd..ef931f65a 100644
--- a/app/layoutconfigdialog.ui
+++ b/app/layoutconfigdialog.ui
@@ -27,8 +27,8 @@
       <attribute name="title">
        <string>Layouts</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="0" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
         <widget class="QTableView" name="layoutsView">
          <property name="showGrid">
           <bool>false</bool>
@@ -44,7 +44,7 @@
          </attribute>
         </widget>
        </item>
-       <item row="0" column="1">
+       <item>
         <widget class="QWidget" name="widget" native="true">
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
@@ -119,8 +119,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
+     <x>254</x>
+     <y>341</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -135,8 +135,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
+     <x>322</x>
+     <y>341</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>