Revert "Avoid not needed click"

This reverts commit ecc3c4d4b51c046a9cd003eaaad39e11bc6bfecf.