Improve open buffer behaviour.