No lock: while editing in-place, if entitiy selected from the entity list, cancel previous one and edit new one
Externalize functionality for switching to new entities