Tweaking how image selector is handled to improve user experience.