diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs
index 810383caf..eacfb0f91 100644
--- a/PKHeX/MainWindow/Main.Designer.cs
+++ b/PKHeX/MainWindow/Main.Designer.cs
@@ -5647,6 +5647,7 @@ public void InitializeComponent()
             this.Name = "Main";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "PKHeX";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
             this.DragDrop += new System.Windows.Forms.DragEventHandler(this.tabMain_DragDrop);
             this.DragEnter += new System.Windows.Forms.DragEventHandler(this.tabMain_DragEnter);
             this.tabMain.ResumeLayout(false);
diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index 1fedcea75..376998540 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -2994,6 +2994,17 @@ private void dragoutDrop(object sender, DragEventArgs e)
 
             Cursor = DefaultCursor;
         }
+
+        private void Main_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (SAV.Edited)
+            {
+                if (Util.Prompt(MessageBoxButtons.YesNo, "Any unsaved changes will be lost.  Are you sure you want to close PKHeX?") != DialogResult.Yes)
+                {
+                    e.Cancel = true;
+                }
+            }
+        }
         #endregion
 
         #region //// SAVE FILE FUNCTIONS ////
@@ -3054,6 +3065,7 @@ private void clickExportSAV(object sender, EventArgs e)
 
             bool dsv = Path.GetExtension(main.FileName)?.ToLower() == ".dsv";
             File.WriteAllBytes(main.FileName, SAV.Write(dsv));
+            SAV.Edited = false;
             Util.Alert("SAV exported to:", main.FileName);
         }