diff --git a/calendar/js/app.js b/calendar/js/app.js
index 3f6e2a892c..ddc5407880 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -608,6 +608,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 								parent = widget._parent;
 								children.splice(idx,0,widget);
 							},this,et2_calendar_daycol);
+							parent.day_widgets.sort(function(a,b) {
+								return children.indexOf(a) - children.indexOf(b);
+							});
 						}
 						else
 						{
@@ -625,6 +628,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 						// Directly update, since there is no other changes needed,
 						// and we don't want the current sort order applied
 						app.calendar.state.owner = sortedArr;
+						parent.options.owner = sortedArr;
 					}
 				}
 			});
diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index ddaf79b1a4..6583b7b395 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -465,7 +465,7 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
 	 * @return {String}
 	 */
 	_tooltip: function() {
-		if(!this.div) return '';
+		if(!this.div || !this.options.value || !this.options.value.app_id) return '';
 
 		var border = this.div.css('borderTopColor');
 		var bg_color = this.div.css('background-color');