diff --git a/app/settingsdialog.cpp b/app/settingsdialog.cpp
index bd7a950a2..296e1b2a8 100644
--- a/app/settingsdialog.cpp
+++ b/app/settingsdialog.cpp
@@ -184,6 +184,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, DockCorona *corona)
 
     connect(ui->autostartChkBox, &QCheckBox::stateChanged, this, &SettingsDialog::updateApplyButtonsState);
     connect(ui->infoWindowChkBox, &QCheckBox::stateChanged, this, &SettingsDialog::updateApplyButtonsState);
+    connect(ui->noBordersForMaximizedChkBox, &QCheckBox::stateChanged, this, &SettingsDialog::updateApplyButtonsState);
     connect(ui->tabWidget, &QTabWidget::currentChanged, this, &SettingsDialog::updateApplyButtonsState);
 
     connect(aboutAction, &QAction::triggered, m_corona, &DockCorona::aboutApplication);
@@ -724,6 +725,7 @@ void SettingsDialog::restoreDefaults()
         //! Defaults for general Latte settings
         ui->autostartChkBox->setChecked(true);
         ui->infoWindowChkBox->setChecked(true);
+        ui->noBordersForMaximizedChkBox->setChecked(false);
         ui->highSensitivityBtn->setChecked(true);
         ui->screenTrackerSpinBox->setValue(SCREENTRACKERDEFAULTVALUE);
     }
@@ -862,6 +864,7 @@ void SettingsDialog::loadSettings()
 
     ui->autostartChkBox->setChecked(m_corona->universalSettings()->autostart());
     ui->infoWindowChkBox->setChecked(m_corona->universalSettings()->showInfoWindow());
+    ui->noBordersForMaximizedChkBox->setChecked(m_corona->universalSettings()->canDisableBorders());
 
     if (m_corona->universalSettings()->mouseSensitivity() == Dock::LowSensitivity) {
         ui->lowSensitivityBtn->setChecked(true);
@@ -893,6 +896,7 @@ QList<int> SettingsDialog::currentSettings()
     settings << m_inMemoryButtons->checkedId();
     settings << (int)ui->autostartChkBox->isChecked();
     settings << (int)ui->infoWindowChkBox->isChecked();
+    settings << (int)ui->noBordersForMaximizedChkBox->isChecked();
     settings << m_mouseSensitivityButtons->checkedId();
     settings << ui->screenTrackerSpinBox->value();
     settings << m_model->rowCount();
@@ -1135,7 +1139,7 @@ void SettingsDialog::updateApplyButtonsState()
     } else if (ui->tabWidget->currentIndex() == 1) {
         //! Defaults for general Latte settings
 
-        if (!ui->autostartChkBox->isChecked() || !ui->infoWindowChkBox->isChecked()
+        if (!ui->autostartChkBox->isChecked() || !ui->infoWindowChkBox->isChecked() || ui->noBordersForMaximizedChkBox->isChecked()
             || !ui->highSensitivityBtn->isChecked() || ui->screenTrackerSpinBox->value() != SCREENTRACKERDEFAULTVALUE) {
             ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(true);
         } else {
@@ -1257,10 +1261,12 @@ bool SettingsDialog::saveAllChanges()
     Latte::Dock::MouseSensitivity sensitivity = static_cast<Latte::Dock::MouseSensitivity>(m_mouseSensitivityButtons->checkedId());
     bool autostart = ui->autostartChkBox->isChecked();
     bool showInfoWindow = ui->infoWindowChkBox->isChecked();
+    bool noBordersForMaximized = ui->noBordersForMaximizedChkBox->isChecked();
 
     m_corona->universalSettings()->setMouseSensitivity(sensitivity);
     m_corona->universalSettings()->setAutostart(autostart);
     m_corona->universalSettings()->setShowInfoWindow(showInfoWindow);
+    m_corona->universalSettings()->setCanDisableBorders(noBordersForMaximized);
     m_corona->universalSettings()->setScreenTrackerInterval(ui->screenTrackerSpinBox->value());
 
     //! Update Layouts
diff --git a/app/settingsdialog.ui b/app/settingsdialog.ui
index ace1b07c6..89c62d579 100644
--- a/app/settingsdialog.ui
+++ b/app/settingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>840</width>
-    <height>608</height>
+    <height>617</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -273,7 +273,8 @@
                  <string comment="locked layout">Locked</string>
                 </property>
                 <property name="icon">
-                 <iconset theme="object-locked"/>
+                 <iconset theme="object-locked">
+                  <normaloff>.</normaloff>.</iconset>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -444,7 +445,7 @@
             <x>0</x>
             <y>0</y>
             <width>805</width>
-            <height>505</height>
+            <height>514</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_9">
@@ -563,6 +564,36 @@
                </item>
               </layout>
              </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_14">
+               <item>
+                <spacer name="horizontalSpacer_10">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Maximum</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="noBordersForMaximizedChkBox">
+                 <property name="toolTip">
+                  <string>Activate support for bordeless maximized windows between different layouts</string>
+                 </property>
+                 <property name="text">
+                  <string>Support borderless maximized windows in different layouts</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
              <item>
               <spacer name="verticalSpacer_7">
                <property name="orientation">