As @ssured notes in #4188, the closePopupOnClick option doesn't work properly - there is a need for refactoring the preclick event handler of L.Popup, and possibly make a unit test to prevent regressions.