diff --git a/calendar/js/app.js b/calendar/js/app.js
index 81a51307d1..67f4435b3b 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2850,9 +2850,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 						app.calendar._fetch_data(state, instance, start + data.order.length);
 					}, 100);
 				}
-
 				// Hide AJAX loader
-				if(typeof framework !== 'undefined')
+				else if(typeof framework !== 'undefined')
 				{
 					framework.applications.calendar.sidemenuEntry.hideAjaxLoader();
 				}
diff --git a/calendar/js/et2_widget_planner.js b/calendar/js/et2_widget_planner.js
index b51d378525..8f5abac562 100644
--- a/calendar/js/et2_widget_planner.js
+++ b/calendar/js/et2_widget_planner.js
@@ -702,7 +702,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
 			this.widget.update_timer = null;
 			this.widget.doInvalidate = true;
 
-			window.setTimeout(jQuery.proxy(function() {if(this.loader) this.loader.hide();},this.widget),100);
+			window.setTimeout(jQuery.proxy(function() {if(this.loader) this.loader.hide();},this.widget),500);
 		},{widget:this,"trigger":trigger}),ET2_GRID_INVALIDATE_TIMEOUT);
 	},
 
@@ -1779,7 +1779,8 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
 			}
 			return result;
 		}
-		else if (this.gridHeader.has(_ev.target).length > 0 && !jQuery.isEmptyObject(_ev.target.dataset))
+		else if (this.gridHeader.has(_ev.target).length > 0 && !jQuery.isEmptyObject(_ev.target.dataset) ||
+			$j(_ev.target).hasClass('calendar_plannerRowHeader') && !jQuery.isEmptyObject(_ev.target.dataset))
 		{
 			// Click on a header, we can go there
 			_ev.data = jQuery.extend({},_ev.target.parentNode.dataset, _ev.target.dataset);