Remember cursor position when re-entering edit mode for a block

If you leave the editing mode of a block and then jump straight back into edit mode (because you want to add something), it would be useful if the cursor were back where it was, when you left the editing mode.

I am really only talking about editing again immediately after leaving the editing mode.