Fix tracking of focus. Resolves issue with hitting enter key