ECMS-4340: Fix problems about close popup and switch tab on Manage Template component