diff --git a/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs b/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs
index aaef8cce52..75e65cd190 100644
--- a/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs
@@ -53,9 +53,23 @@ namespace BizHawk.Client.EmuHawk
 					bmp.SetPixel(i, j, col);
 				}
 			}
+
+			if (pictureBox1.Image != null) pictureBox1.Image.Dispose();
 			pictureBox1.Image = bmp;
 		}
 
+		protected override void OnClosed(EventArgs e)
+		{
+			base.OnClosed(e);
+			
+			if (pictureBox1.Image != null)
+			{
+				pictureBox1.Image.Dispose();
+				pictureBox1.Image = null;
+			}
+
+		}
+
 		private void buttonPal_Click(object sender, EventArgs e)
 		{
 			OpenFileDialog ofd = new OpenFileDialog