Bug fix with keyboard focus