diff --git a/Core/Other/FormSettings.cs b/Core/Other/FormSettings.cs
index bf08928e..f793e355 100644
--- a/Core/Other/FormSettings.cs
+++ b/Core/Other/FormSettings.cs
@@ -62,13 +62,17 @@ private void btnManageOptions_Click(object sender, EventArgs e){
             currentTab.Control.OnClosing();
 
             using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
+                FormClosing -= FormSettings_FormClosing;
+
                 if (dialog.ShowDialog() == DialogResult.OK){
-                    FormClosing -= FormSettings_FormClosing;
                     browser.ResumeNotification();
 
                     ShouldReloadBrowser = dialog.ShouldReloadBrowser;
                     Close();
                 }
+                else{
+                    FormClosing += FormSettings_FormClosing;
+                }
             }
         }
 
diff --git a/Core/Other/Settings/Export/ExportFileFlags.cs b/Core/Other/Settings/Export/ExportFileFlags.cs
index 7b721364..27fc318e 100644
--- a/Core/Other/Settings/Export/ExportFileFlags.cs
+++ b/Core/Other/Settings/Export/ExportFileFlags.cs
@@ -5,7 +5,7 @@ namespace TweetDuck.Core.Other.Settings.Export{
     enum ExportFileFlags{
         None = 0,
         UserConfig = 1,
-        SystemConfig = 2,
+        SystemConfig = 2, // TODO implement later
         Session = 4,
         PluginData = 8,
         All = UserConfig|SystemConfig|Session|PluginData