Fix over zealous active view removal