diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index bbc85961a1..1813cfd0e0 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2400,9 +2400,9 @@ namespace BizHawk.MultiClient
 		private void Render()
 		{
 			var video = Global.Emulator.VideoProvider;
-			if (video.BufferHeight != lastHeight || video.VirtualWidth != lastWidth)
+			if (video.BufferHeight != lastHeight || video.BufferWidth != lastWidth)
 			{
-				lastWidth = video.VirtualWidth;
+				lastWidth = video.BufferWidth;
 				lastHeight = video.BufferHeight;
 				FrameBufferResized();
 			}
@@ -2420,18 +2420,14 @@ namespace BizHawk.MultiClient
 			int borderHeight = Size.Height - renderTarget.Size.Height;
 
 			// start at target zoom and work way down until we find acceptable zoom
-            int videoWidth = video.BufferWidth; // just so its initialized
-            int videoHeight = video.BufferHeight;
-            for (; zoom >= 1; zoom--)
+			for (; zoom >= 1; zoom--)
 			{
-                videoWidth = 320 * zoom;
-                videoHeight = video.BufferHeight * zoom;
-				if ((videoWidth + borderWidth < area.Width) && (videoHeight + borderHeight < area.Height))
+				if ((((video.BufferWidth * zoom) + borderWidth) < area.Width) && (((video.BufferHeight * zoom) + borderHeight) < area.Height))
 					break;
 			}
 
 			// Change size
-			Size = new Size(videoWidth + borderWidth, videoHeight + borderHeight);
+			Size = new Size((video.BufferWidth * zoom) + borderWidth, (video.BufferHeight * zoom + borderHeight));
 			PerformLayout();
 			Global.RenderPanel.Resized = true;