diff --git a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs
index b6cf385f49..ae18448e57 100644
--- a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs
+++ b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs
@@ -597,6 +597,8 @@ namespace BizHawk.Client.Common
 
 		public void Dispose()
 		{
+			UnlockSurface(DisplaySurfaceID.EmuCore);
+			UnlockSurface(DisplaySurfaceID.Client);
 			foreach (var brush in _solidBrushes.Values) brush.Dispose();
 			foreach (var brush in _pens.Values) brush.Dispose();
 		}