Issue #8084 by turegjorup: MediaController corrected