Menu: Maintain focus on already selected item during typeahead

Fixes #10644
Actually, I'm wondering if this entire if check (and an else) can go away because the same thing is checked two lines earlier.