Also selecting Wave should work, regardless of where the working cursor is (currently it doesn't if you are on a track start/end). Similarly, when in Wave mode, happening to centre on a track start/end point should not force you into Track mode, leave that choice up to the user. It DOES make sense when using the Correction list to navigate.