Bug fix with regaining focus after a click.;