Re-factored the selection normalization logic and enabled it in EnterKey to work around #6688