#1055 - Fix file selector