Consolidate folder selection implementations

This suggestion has been merged into another suggestion:

Improve and consolidate folder selector