Schema Treasure Room Portals

I previously had an issue with the location of the exit portal in the floor 3 treasure room being too close to the chests.
Now the issue is with the exit portal after Zarokh. It's too close to the altar where you exchange sacred water for keys. On controller you can accidentally click the portal instead of getting keys and there is no way to return for your rewards.
Please move this portal or make returning to the treasure room if you have unused keys possible.