diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index b8256676c0..a6d6018973 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -4590,7 +4590,15 @@ namespace BizHawk.MultiClient
 
 		private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			new N64VideoPluginconfig().ShowDialog();
+			var result = new N64VideoPluginconfig().ShowDialog();
+			if (result == DialogResult.OK)
+			{
+				Global.OSD.AddMessage("Plugin settings saved");
+			}
+			else
+			{
+				Global.OSD.AddMessage("Plugin settings aborted");
+			}
 		}
 
 		private void savestateTypeToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
index 1b6778e7bd..fe96235931 100644
--- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
+++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
@@ -32,7 +32,6 @@
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(N64VideoPluginconfig));
 			this.N64plugintabcontrol = new System.Windows.Forms.TabControl();
 			this.N64vpluginglobaltab = new System.Windows.Forms.TabPage();
-			this.label3 = new System.Windows.Forms.Label();
 			this.label2 = new System.Windows.Forms.Label();
 			this.VideoResolutionComboBox = new System.Windows.Forms.ComboBox();
 			this.PluginComboBox = new System.Windows.Forms.ComboBox();
@@ -208,7 +207,7 @@
 			this.label33 = new System.Windows.Forms.Label();
 			this.Glide_depth_bias = new System.Windows.Forms.TextBox();
 			this.GlideUseDefaultHacks2 = new System.Windows.Forms.CheckBox();
-			this.button1 = new System.Windows.Forms.Button();
+			this.SaveButton = new System.Windows.Forms.Button();
 			this.CancelBT = new System.Windows.Forms.Button();
 			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
 			this.N64plugintabcontrol.SuspendLayout();
@@ -239,12 +238,11 @@
 			this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2);
 			this.N64plugintabcontrol.Name = "N64plugintabcontrol";
 			this.N64plugintabcontrol.SelectedIndex = 0;
-			this.N64plugintabcontrol.Size = new System.Drawing.Size(580, 365);
+			this.N64plugintabcontrol.Size = new System.Drawing.Size(580, 369);
 			this.N64plugintabcontrol.TabIndex = 0;
 			// 
 			// N64vpluginglobaltab
 			// 
-			this.N64vpluginglobaltab.Controls.Add(this.label3);
 			this.N64vpluginglobaltab.Controls.Add(this.label2);
 			this.N64vpluginglobaltab.Controls.Add(this.VideoResolutionComboBox);
 			this.N64vpluginglobaltab.Controls.Add(this.PluginComboBox);
@@ -252,20 +250,11 @@
 			this.N64vpluginglobaltab.Location = new System.Drawing.Point(4, 22);
 			this.N64vpluginglobaltab.Name = "N64vpluginglobaltab";
 			this.N64vpluginglobaltab.Padding = new System.Windows.Forms.Padding(3);
-			this.N64vpluginglobaltab.Size = new System.Drawing.Size(572, 339);
+			this.N64vpluginglobaltab.Size = new System.Drawing.Size(572, 343);
 			this.N64vpluginglobaltab.TabIndex = 0;
 			this.N64vpluginglobaltab.Text = "Global";
 			this.N64vpluginglobaltab.UseVisualStyleBackColor = true;
 			// 
-			// label3
-			// 
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(54, 199);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(103, 13);
-			this.label3.TabIndex = 14;
-			this.label3.Text = "More Global Options";
-			// 
 			// label2
 			// 
 			this.label2.AutoSize = true;
@@ -2406,19 +2395,21 @@
 			this.GlideUseDefaultHacks2.UseVisualStyleBackColor = true;
 			this.GlideUseDefaultHacks2.CheckedChanged += new System.EventHandler(this.GlideUseDefaultHacks2_CheckedChanged);
 			// 
-			// button1
+			// SaveButton
 			// 
-			this.button1.Location = new System.Drawing.Point(365, 373);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 1;
-			this.button1.Text = "Save";
-			this.button1.UseVisualStyleBackColor = true;
-			this.button1.Click += new System.EventHandler(this.button1_Click);
+			this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.SaveButton.Location = new System.Drawing.Point(409, 373);
+			this.SaveButton.Name = "SaveButton";
+			this.SaveButton.Size = new System.Drawing.Size(75, 23);
+			this.SaveButton.TabIndex = 1;
+			this.SaveButton.Text = "Save";
+			this.SaveButton.UseVisualStyleBackColor = true;
+			this.SaveButton.Click += new System.EventHandler(this.button1_Click);
 			// 
 			// CancelBT
 			// 
-			this.CancelBT.Location = new System.Drawing.Point(461, 373);
+			this.CancelBT.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.CancelBT.Location = new System.Drawing.Point(490, 373);
 			this.CancelBT.Name = "CancelBT";
 			this.CancelBT.Size = new System.Drawing.Size(75, 23);
 			this.CancelBT.TabIndex = 2;
@@ -2438,9 +2429,9 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(577, 408);
+			this.ClientSize = new System.Drawing.Size(577, 401);
 			this.Controls.Add(this.CancelBT);
-			this.Controls.Add(this.button1);
+			this.Controls.Add(this.SaveButton);
 			this.Controls.Add(this.N64plugintabcontrol);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
 			this.Name = "N64VideoPluginconfig";
@@ -2480,10 +2471,9 @@
 		private System.Windows.Forms.TabPage N64vpluginglobaltab;
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.ComboBox PluginComboBox;
-		private System.Windows.Forms.Label label3;
 		private System.Windows.Forms.Label label2;
 		private System.Windows.Forms.ComboBox VideoResolutionComboBox;
-		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button SaveButton;
 		private System.Windows.Forms.Button CancelBT;
 		private System.Windows.Forms.TabPage RiceTabPage;
 		private System.Windows.Forms.ToolTip toolTip1;
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
index bada361a80..da425d7fad 100644
--- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
+++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
@@ -19,12 +19,14 @@ namespace BizHawk.MultiClient
 		private void CancelBT_Click(object sender, EventArgs e)
 		{
 			//Add confirmation of cancelling change
+			DialogResult = DialogResult.Cancel;
 			Close();
 		}
 
 		private void button1_Click(object sender, EventArgs e)
 		{
 			SaveSettings();
+			DialogResult = DialogResult.OK;
 			Close();
 		}
 
@@ -229,7 +231,6 @@ namespace BizHawk.MultiClient
 			PluginComboBox.Text = Global.Config.N64VidPlugin;
 
 			//Rice
-			Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind
 			RiceNormalAlphaBlender_CB.Checked = Global.Config.RicePlugin.NormalAlphaBlender;
 			RiceFastTextureLoading_CB.Checked = Global.Config.RicePlugin.FastTextureLoading;
 			RiceAccurateTextureMapping_CB.Checked = Global.Config.RicePlugin.AccurateTextureMapping;
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx
index c4fc49b6bb..cbb95d6009 100644
--- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx
+++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx
@@ -120,9 +120,6 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="AnisotropicFiltering_LB.ToolTip" xml:space="preserve">
     <value>Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). 
 This is uneffective if Mipmapping is 0.