SONAR-5134 Fix issue with keyboard navigation