Better detection when to show the button