Ensure scope is narrowed on refresh

Fixes gh-134