Minor file and page picker improvements (see #5780)