diff --git a/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj b/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
index 099a33b0b1..17070aad15 100644
--- a/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
+++ b/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
@@ -13,6 +13,7 @@
 		<OutputType>WinExe</OutputType>
 	</PropertyGroup>
 	<ItemGroup>
+		<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
 		<Reference Include="System.Windows.Forms" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics.Controls/BizHawk.Bizware.Graphics.Controls.csproj" />
 		<EmbeddedResource Include="TestImages/**/*" />
diff --git a/src/BizHawk.Bizware.Test/Program.cs b/src/BizHawk.Bizware.Test/Program.cs
index 2fc5b1acba..2b223be3f8 100644
--- a/src/BizHawk.Bizware.Test/Program.cs
+++ b/src/BizHawk.Bizware.Test/Program.cs
@@ -86,8 +86,8 @@ namespace BizHawk.Bizware.Test
 			var running = true;
 			c.MouseClick += (_, args) =>
 			{
-				if (args.Button == MouseButtons.Left) running ^= true;
-				else if (args.Button == MouseButtons.Right) c.Retain ^= true;
+				if (args.Button == MouseButtons.Left) running = !running;
+				else if (args.Button == MouseButtons.Right) c.Retain = !c.Retain;
 			};
 
 			var start = DateTime.Now;