Make "edit" less intrusive [finishes #81226018]