Started work on highlights behaviour when pressing Enter