diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs
index 0b35528e5..6b79008cb 100644
--- a/ShareX/Forms/ApplicationSettingsForm.cs
+++ b/ShareX/Forms/ApplicationSettingsForm.cs
@@ -471,9 +471,12 @@ private void btnExport_Click(object sender, EventArgs e)
                     },
                     () =>
                     {
-                        pbExportImport.Visible = false;
-                        btnExport.Enabled = true;
-                        btnImport.Enabled = true;
+                        if (!IsDisposed)
+                        {
+                            pbExportImport.Visible = false;
+                            btnExport.Enabled = true;
+                            btnImport.Enabled = true;
+                        }
                     });
                 }
             }
@@ -498,10 +501,15 @@ private void btnImport_Click(object sender, EventArgs e)
                     },
                     () =>
                     {
-                        UpdateSettings();
-                        pbExportImport.Visible = false;
-                        btnExport.Enabled = true;
-                        btnImport.Enabled = true;
+                        if (!IsDisposed)
+                        {
+                            UpdateSettings();
+                            pbExportImport.Visible = false;
+                            btnExport.Enabled = true;
+                            btnImport.Enabled = true;
+                        }
+
+                        Program.MainForm.UpdateSettings();
                     });
                 }
             }
diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index 60346a091..1c7306215 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -523,7 +523,7 @@ private void CleanCustomClipboardFormats()
             }
         }
 
-        private void UpdateSettings()
+        public void UpdateSettings()
         {
             niTray.Visible = Program.Settings.ShowTray;