Undo Group not working for setting keyframes AE 2024

Often I set Transform keyframes using the keyboard shortcut 'Alt + R' (or whichever transform shotcut key I need - APSRT), however in AE 2024 this seems to delect the layer after setting it. 

So if I wanted to, for example, set a position keyframe and a rotation keyframe then I would usually press 'Alt+P' and then 'Alt+R'.   However, as the layer becomes deselected after the first input, the second keyframe sets a rotation keyframe on all the layers in that comp. To add to the frustration there seems to be no undo-group for this function, so the new keyframes on every layer need to be undone one by one.

A better functionality would be to keep the layer selected after the set keyframe shortcut is used. Also adding in an undo function that undoes any mistaken keyframes on multiple layers all at once.