Fixed minor issue with modal enter events