CMF-2033 - Click Image to Close