diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index c9807e4598..41ab2ff3b0 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1780,7 +1780,7 @@ class calendar_boupdate extends calendar_bo
 
 		$event_arr['link']['field'] = lang('URL');
 		$eventStart_arr = $this->date2array($event['start']); // give this as 'date' to the link to pick the right recurrence for the participants state
-		$link = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit&cal_id='.$event['id'].'&date='.$eventStart_arr['full'].'&no_popup=1';
+		$link = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit&cal_id='.$event['id'].'&date='.$eventStart_arr['full'].'&no_popup=1&ajax=true';
 		// if url is only a path, try guessing the rest ;-)
 		if ($link[0] == '/')
 		{
diff --git a/calendar/js/app.js b/calendar/js/app.js
index 90d75ef9b5..b02251280d 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -194,9 +194,12 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 				jQuery(_et2.DOMContainer).hide();
 
 				// Set client side holiday cache for this year
-				egw.window.et2_calendar_view.holiday_cache[content.data.year] = content.data.holidays;
-				delete content.data.holidays;
-				delete content.data.year;
+				if(egw.window.et2_calendar_view)
+				{
+					egw.window.et2_calendar_view.holiday_cache[content.data.year] = content.data.holidays;
+					delete content.data.holidays;
+					delete content.data.year;
+				}
 
 				this._setup_sidebox_filters();
 
@@ -236,6 +239,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 				{
 					this.et2.getWidgetById('title').input.select();
 				}
+
+				// Disable loading prompt (if loaded nopopup)
+				egw.loading_prompt(this.appname,false);
 				break;
 
 			case 'calendar.freetimesearch':