diff --git a/vkconfig/CHANGELOG.md b/vkconfig/CHANGELOG.md
index dafd5b5365..56a7674f5b 100644
--- a/vkconfig/CHANGELOG.md
+++ b/vkconfig/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Improvements:
 - Show message warnings when overriding implicit layer, either disabling or enabling
+- Removing layers override when closing OS session
 
 ### Fixes:
 - Fix flag settings dependencies
diff --git a/vkconfig/mainwindow.cpp b/vkconfig/mainwindow.cpp
index 89d4167a65..602d6bb5a7 100644
--- a/vkconfig/mainwindow.cpp
+++ b/vkconfig/mainwindow.cpp
@@ -37,6 +37,7 @@
 #include "../vkconfig_core/help.h"
 #include "../vkconfig_core/doc.h"
 #include "../vkconfig_core/date.h"
+#include "../vkconfig_core/override.h"
 
 #include <QProcess>
 #include <QMessageBox>
@@ -93,6 +94,8 @@ MainWindow::MainWindow(QWidget *parent)
 
     SetupLauncherTree();
 
+    connect(qApp, &QGuiApplication::commitDataRequest, this, &MainWindow::commitDataRequest);
+
     connect(ui->action_find_more_layers, SIGNAL(triggered(bool)), this, SLOT(OnHelpFindLayers(bool)));
     connect(ui->actionAbout, SIGNAL(triggered(bool)), this, SLOT(OnHelpAbout(bool)));
     connect(ui->actionVulkan_Info, SIGNAL(triggered(bool)), this, SLOT(toolsVulkanInfo(bool)));
@@ -155,6 +158,16 @@ MainWindow::MainWindow(QWidget *parent)
 
 MainWindow::~MainWindow() { ResetLaunchApplication(); }
 
+void MainWindow::commitDataRequest(QSessionManager &manager) {
+    (void)manager;
+
+    Configurator &configurator = Configurator::Get();
+
+    const Environment &environment = configurator.environment;
+
+    SurrenderConfiguration(configurator.environment);
+}
+
 void MainWindow::InitTray() {
     if (QSystemTrayIcon::isSystemTrayAvailable()) {
         this->_tray_quit_action = new QAction("&Quit", this);
diff --git a/vkconfig/mainwindow.h b/vkconfig/mainwindow.h
index d2abed0e83..f24d152dde 100644
--- a/vkconfig/mainwindow.h
+++ b/vkconfig/mainwindow.h
@@ -119,6 +119,8 @@ class MainWindow : public QMainWindow {
     void iconActivated(QSystemTrayIcon::ActivationReason reason);
 
    public Q_SLOTS:
+    void commitDataRequest(QSessionManager &manager);
+
     void toolsVulkanInfo(bool checked);
     void toolsVulkanInstallation(bool checked);
     void toolsResetToDefault(bool checked);