Yes, and also remove an open overlay whenever you click elsewhere on the map.