ref #6971 Fix creation of two sessions for each name editor