Media chooser fix, [Delivers #76459546]