diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 7abbf8ec08..05114e26c3 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -2236,10 +2236,23 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ProfileFirstBootLabel_Click(object sender, EventArgs e)
 		{
-			var profileForm = new ProfileConfig();
-			profileForm.ShowDialog();
-			Global.Config.FirstBoot = false;
-			ProfileFirstBootLabel.Visible = false;
+			//We should make sure the user actually picked a Profile.
+			if (new ProfileConfig().ShowDialog() == DialogResult.OK)
+			{
+				GlobalWin.OSD.AddMessage("Profile settings saved");
+				//We hide the FirstBoot items since the user setup a Profile
+				//Is it a bad thing to do this constantly?
+				Global.Config.FirstBoot = false;
+				ProfileFirstBootLabel.Visible = false;
+			}
+			else
+			{
+				GlobalWin.OSD.AddMessage("Profile config aborted");
+			}
+			//var profileForm = new ProfileConfig();
+			//profileForm.ShowDialog();
+			//Global.Config.FirstBoot = false;
+			//ProfileFirstBootLabel.Visible = false;
 		}
 
 		#endregion