Fix view changes in calendar module

Fixes #2613