Fix #6968, saving/rollbacking edits deselects current editing tool