diff --git a/Frameworks/BundlesManager/src/BundlesManager.mm b/Frameworks/BundlesManager/src/BundlesManager.mm
index c297d9f1..fc7e5f98 100644
--- a/Frameworks/BundlesManager/src/BundlesManager.mm
+++ b/Frameworks/BundlesManager/src/BundlesManager.mm
@@ -57,10 +57,19 @@ static double const kPollInterval = 3*60*60;
 	{
 		sourceList   = bundles_db::sources();
 		bundlesIndex = bundles_db::index(kInstallDirectory);
+
+		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
 	}
 	return self;
 }
 
+- (void)applicationWillTerminate:(NSNotification*)aNotification
+{
+	D(DBF_BundlesManager, bug("\n"););
+	if(self.needsSaveBundlesIndex)
+		[self saveBundlesIndex:self];
+}
+
 - (void)setAutoUpdateBundles:(BOOL)flag
 {
 	if(_autoUpdateBundles == flag)