diff --git a/src/SHME.ExternalTool/UI/CustomMainForm.cs b/src/SHME.ExternalTool/UI/CustomMainForm.cs
index a327526..1d30913 100644
--- a/src/SHME.ExternalTool/UI/CustomMainForm.cs
+++ b/src/SHME.ExternalTool/UI/CustomMainForm.cs
@@ -284,16 +284,6 @@ public override void UpdateValues(ToolFormUpdateType type)
 				_harryModel = new Ilm(header, remaining);
 			}
 
-			if (_forcedCameraYaw != null)
-			{
-				_holdCameraPitch = 0;
-				_holdCameraYaw = Core.DegreesToGameUnits((float)_forcedCameraYaw);
-				_holdCameraRoll = 0;
-				HoldCamera();
-
-				_forcedCameraYaw = null;
-			}
-
 			switch (type)
 			{
 				case ToolFormUpdateType.PreFrame:
@@ -332,6 +322,15 @@ public override void UpdateValues(ToolFormUpdateType type)
 							SetButtonNames();
 							_lastControllerLayoutHash = hash;
 						}
+						if (_forcedCameraYaw != null)
+						{
+							_holdCameraPitch = 0;
+							_holdCameraYaw = Core.DegreesToGameUnits((float)_forcedCameraYaw);
+							_holdCameraRoll = 0;
+							HoldCamera();
+
+							_forcedCameraYaw = null;
+						}
 						MoveCameraFirstPerson();
 						AimCamera(BtnCameraFps);
 						Mem.WriteU16(Rom.Addresses.MainRam.HarryYaw, _holdCameraYaw);