diff --git a/js/views-admin.js b/js/views-admin.js
index a7fe4f3..c2fcc75 100644
--- a/js/views-admin.js
+++ b/js/views-admin.js
@@ -774,6 +774,14 @@ Drupal.behaviors.viewsFilterConfigSelectAll.attach = function(context) {
     // Update all checkbox beside the select all checkbox.
     $(this).parents('.form-checkboxes').find('input[type=checkbox]').each(function() {
       $(this).attr('checked', checked);
+      // Uncheck the select all checkbox if any of the others are unchecked.
+      if ($(this).attr('id') != 'edit-options-value-all') {
+        $(this).click(function() {
+          if ($(this).is('checked') == 0) {
+            $('#views-ui-config-item-form div.form-item-options-value-all input[type=checkbox]').attr('checked', 0);
+          }
+        });
+      }
     });
   });
 };