GRP-1048: problem with "Browse Folders" in New UI