Fix multiple duplication of Show more button on popup open
Merge branch 'case-4116' into develop