diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 6b82a9831d..90d31941d3 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -3051,7 +3051,6 @@
 			this.Deactivate += new System.EventHandler(this.MainForm_Deactivate);
 			this.Load += new System.EventHandler(this.MainForm_Load);
 			this.Shown += new System.EventHandler(this.MainForm_Shown);
-			this.Paint += new System.Windows.Forms.PaintEventHandler(this.MainForm_Paint);
 			this.Enter += new System.EventHandler(this.MainForm_Enter);
 			this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick);
 			this.Resize += new System.EventHandler(this.MainForm_Resize);
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 3ba829b280..30a0d88bd8 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -428,6 +428,11 @@ namespace BizHawk.MultiClient
 			}
 
 			UpdateStatusSlots();
+
+			renderTarget.Paint += new System.Windows.Forms.PaintEventHandler(delegate
+			{
+				Global.DisplayManager.NeedsToPaint = true;
+			});
 		}
 
 		/// <summary>
@@ -4270,11 +4275,6 @@ namespace BizHawk.MultiClient
 			Global.DisplayManager.NeedsToPaint = true;
 		}
 
-		private void MainForm_Paint(object sender, PaintEventArgs e)
-		{
-			Global.DisplayManager.NeedsToPaint = true;
-		}
-
 		public void LoadRamWatch(bool load_dialog)
 		{
 			if (!RamWatch1.IsHandleCreated || RamWatch1.IsDisposed)