Issue #1555004 by Chaulky, tim.plunkett, molly_n, rlangille, Jerenus: Fixed Incompatible with custom view modes.