I had the problem that when clicking on an event the calendar module disappeared cause the module was configured only to show when a special menu point was selected. So I added

$link.= "&Itemid=".JRequest::getCmd('Itemid');

in line 208 in helper.php