Fix for home button removed, as it creates popup issues.