Move the Locker-Window pairing on Grim Pantry.
Specifically the Locker pictured below, next to the window highlighted by Windows of Opportunity.
There is an equal-sized space on the other side to place a locker, and having it there instead of right next to a vault prevents vault actions being confused for entering lockers, and vice versa.

Comments
Or they could remove one of those windows and killers would actually have a reason to commit to chases in this main building.
make any change to this setup and it makes for a better main building