Change popup behaviour (again)