Fix behaviour of popup when landing on home for second visit