Option to disable "Focus Switch" during Undo

Hi guys,

It often happens that when I have a layer selected and switch focus to its mask to paint, if I make a mistake and press Undo, the focus automatically jumps back to the main layer. If I don't notice it immediately, I start painting on the layer itself instead of the mask.

My colleagues and I all face this same issue. The "Undo" command shouldn't change the selection target. While this behavior might be handy when going back many steps in history, it’s very annoying when you are simply painting on a mask.

I’ve noticed that this happens frequently, though not every single time. Could we have an option in the Preferences to toggle this behavior?

Something like: [ ] Include focus/selection change in Undo history