Don't need a separate 'select' event
Fix focus when undoing with autofocused preset search (fixes #1570)