Fix bug 959955 - Use a single class to find focused element