In my dual mode editor branch #3605 I completely rework the cell selection logic and fix this as well - although in a different manner. Can we leave it out of this PR as it will make that PR more difficult to rebase.