diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml
index ff14171..0ec6bd1 100644
--- a/app/qml/ApplicationSettings.qml
+++ b/app/qml/ApplicationSettings.qml
@@ -148,6 +148,11 @@ QtObject {
         fontScaling = Math.max(fontScaling - 0.05, minimumFontScaling)
     }
 
+    function close() {
+        storeSettings()
+        storeCustomProfiles()
+    }
+
     property Storage storage: Storage {}
 
     function stringify(obj) {
@@ -891,11 +896,6 @@ QtObject {
 
         initializedSettings()
     }
-    Component.onDestruction: {
-        storeSettings()
-        storeCustomProfiles()
-        //        storage.dropSettings(); //DROPS THE SETTINGS!.. REMEMBER TO DISABLE ONCE ENABLED!!
-    }
 
     // VARS ///////////////////////////////////////////////////////////////////
     property Label _sampleLabel: Label {
diff --git a/app/qml/TerminalWindow.qml b/app/qml/TerminalWindow.qml
index 86d9c2a..951f311 100644
--- a/app/qml/TerminalWindow.qml
+++ b/app/qml/TerminalWindow.qml
@@ -102,7 +102,7 @@ ApplicationWindow {
         id: quitAction
         text: qsTr("Quit")
         shortcut: "Ctrl+Shift+Q"
-        onTriggered: Qt.quit()
+        onTriggered: appSettings.close()
     }
     Action {
         id: showsettingsAction
diff --git a/app/qml/main.qml b/app/qml/main.qml
index cd16518..d2c4854 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -64,7 +64,8 @@ QtObject {
 
         window.destroy()
 
-        if (windowsModel.count === 0)
-            Qt.quit()
+        if (windowsModel.count === 0) {
+            appSettings.close()
+        }
     }
 }