diff --git a/calendar/sitemgr/class.module_calendar_planner.inc.php b/calendar/sitemgr/class.module_calendar_planner.inc.php
index 74f2ce3a51..34eab822e7 100644
--- a/calendar/sitemgr/class.module_calendar_planner.inc.php
+++ b/calendar/sitemgr/class.module_calendar_planner.inc.php
@@ -336,8 +336,8 @@ class module_calendar_planner extends Module
 			$tmpl->exec(__METHOD__, $content,$sel_options, array('__ALL__' => true),array(),2);
 			$html .= ob_get_contents();
 			$html .= '<script>'
-			. '	window.egw_LAB.wait(function() {jQuery(function() {'
-			. 'app.calendar.set_state(' . json_encode(array(
+			. '(function() {jQuery("#calendar-planner").on("load",function() {'
+			. 'app.calendar.update_state(' . json_encode(array(
 					'view'   => 'planner',
 					'planner_view' => 'month',
 					'date'   => Api\DateTime::to($ui->first, Api\DateTime::ET2),
@@ -345,7 +345,7 @@ class module_calendar_planner extends Module
 					'sortby' => $ui->sortby,
 					'filter' => $arguments['filter']
 				)).');'
-			. '});});'
+			. '});})();'
 			. '</script>';
 
 			ob_end_clean();