ENYO-556: Pressing [Enter] in pointer mode should only switch to 5-way mode

Cherry-picking from master to 2.5-upkeep