diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index 41db631a2..3a65f6d2b 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -581,9 +581,10 @@
         folder.$selectedMessages = [];
         for (; i < length; i++) {
           folder.$messages[i].selected = !vm.allSelected;
-          folder.$selectedMessages.push(folder.$messages[i]);
+          if(folder.$messages[i].selected)
+            folder.$selectedMessages.push(folder.$messages[i]);
+            count++;
         }
-        count += length;
       });
       vm.allSelected = !vm.allSelected;
       vm.mode.multiple = count;
diff --git a/UI/WebServerResources/js/Scheduler/CalendarListController.js b/UI/WebServerResources/js/Scheduler/CalendarListController.js
index dc4f4ec2d..4bb086b75 100644
--- a/UI/WebServerResources/js/Scheduler/CalendarListController.js
+++ b/UI/WebServerResources/js/Scheduler/CalendarListController.js
@@ -140,19 +140,20 @@
     }
 
     function confirmDeleteSelectedComponents() {
-      Dialog.confirm(l('Warning'),
-                     l('Are you sure you want to delete the selected components?'),
-                     { ok: l('Delete') })
-        .then(function() {
-          // User confirmed the deletion
-          var components = _.filter(Component['$' + vm.componentType], function(component) {
-            return component.selected;
+      var components = _.filter(Component['$' + vm.componentType], function(component) {
+        return component.selected;
+      });
+      if(components.length > 0)
+        Dialog.confirm(l('Warning'),
+                      l('Are you sure you want to delete the selected components?'),
+                      { ok: l('Delete') })
+          .then(function() {
+            // User confirmed the deletion
+            Calendar.$deleteComponents(components).then(function() {
+              vm.mode.multiple = 0;
+              $rootScope.$emit('calendars:list');
+            });
           });
-          Calendar.$deleteComponents(components).then(function() {
-            vm.mode.multiple = 0;
-            $rootScope.$emit('calendars:list');
-          });
-        });
     }
 
     function openEvent($event, event) {