"Add bass clef"/"Add treble clef" add at unexpected location (step entry cursor location)

1) Add some notes in step entry mode,
2) Hit Esc, then select another note/rest/measure elsewhere in the score on a treble clef staff
3) Type the shortcut sequence to add a bass clef. Factory default is Ctrl+Y,Ctrl+2 for bass clef but note that this doesn't work if "redo" is active (separate issue), assign a new shortcut if needed
4) Bass clef appears where step entry mode cursor had previously been, rather in front of selected note/rest.

Same applies for add-treble-clef

Expected behaviour: clef should be added before selected note if not in note entry mode.