Updated to fix click selection focus clearing