Ensure we reset the correct state on reopen

Fixes #70