Cleaner state handling when switching between selection modes (NBE2) [1074]