Fix issue where keyboard nav didn't work