diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs
index dbe1b3d05d..e4ff1685c1 100644
--- a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs
@@ -233,6 +233,7 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScroll = true;
 			this.ClientSize = new System.Drawing.Size(1078, 954);
 			this.Controls.Add(this.label1);
 			this.Controls.Add(this.groupBox5);
diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
index 659f0762bc..e7e801cc78 100644
--- a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
@@ -21,6 +21,12 @@ namespace BizHawk.Client.EmuHawk
 		private LibGPGX.VDPView View = new LibGPGX.VDPView();
 		int palindex = 0;
 
+		protected override System.Drawing.Point ScrollToControl(System.Windows.Forms.Control activeControl)
+		{
+			// Returning the current location prevents the panel from scrolling to the active control when the panel loses and regains focus
+			return this.DisplayRectangle.Location;
+		}
+
 		public GenVDPViewer()
 		{
 			InitializeComponent();