More fixes for FolderSelectionDialog for #22