Fix popup closing on no results found regression