SWITCHYARD-1947 - Fixing F2/rename issue with selection in editor