Fix over zealous active view removal - Fixes #1657
Merge pull request #1753 from CrowdStrike/active-views-fix

Fix over zealous active view removal