diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index b5093acc26f..ef174b7b9cc 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -221,6 +221,7 @@ void KitManager::restoreKits()
 
 KitManager::~KitManager()
 {
+    saveKits(); // Make sure we save the current state on exit!
     // Clean out kit information to avoid calling them during deregistration:
     delete d;
     m_instance = 0;
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index 0177ab1091f..a40ab26ab76 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -203,6 +203,8 @@ void ToolChainManager::restoreToolChains()
 
 ToolChainManager::~ToolChainManager()
 {
+    saveToolChains(); // Make sure to save tool chains when closing
+
     // Deregister tool chains
     QList<ToolChain *> copy = d->toolChains();
     foreach (ToolChain *tc, copy)