Fix for auto-focus to first control (option.focus === true)