diff --git a/api/js/etemplate/et2_dataview_controller_selection.js b/api/js/etemplate/et2_dataview_controller_selection.js
index 7346dc1f36..07ab1595dd 100644
--- a/api/js/etemplate/et2_dataview_controller_selection.js
+++ b/api/js/etemplate/et2_dataview_controller_selection.js
@@ -261,6 +261,8 @@ var et2_dataview_selectionManager = (function(){ "use strict"; return Class.exte
 			var entry = this._registeredRows[key];
 			this._updateEntryState(entry, entry.state);
 		}
+
+		this._selectAll = true;
 	},
 
 	getSelected: function () {
diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index b14d96b10d..7019e3d54f 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -911,7 +911,6 @@ class calendar_uilist extends calendar_ui
 			),
 			'select_all' => array(
 				'caption' => 'Whole query',
-				'checkbox' => true,
 				'hint' => 'Apply the action on the whole query, NOT only the shown events',
 				'group' => ++$group,
 			),