View/Layout changes every time

I have created different layouts for my edit mode:
3 tracks, 4 tracks, 7 tracks, etc.
If I switch from edit mode (e.g. layout 7 tracks) to player mode and then back to edit mode, the layout changes every time to (standard edit mode).
It would be useful to retain the last edit layout used when switching back from player mode.

It already does this, but it might not be perfect with respect to panel sizes on Windows when the window is maximized. What it will always save correctly is which panels are opened, which edges they are along (or floating if so), and the tab stacking.