diff --git a/js/conditional_fields.js b/js/conditional_fields.js
index 6853f84..a4615b9 100644
--- a/js/conditional_fields.js
+++ b/js/conditional_fields.js
@@ -141,4 +141,17 @@ Drupal.behaviors.conditionalFields = {
   }
 };
 
+// Hide fieldsets unless one of their fields is visible.
+$(document).bind('state:visible', function(e) {
+  if (e.trigger) {
+    var $wrapper = $(e.target).closest('.fieldset-wrapper');
+    if ($wrapper.length) {
+      $wrapper.parents('fieldset').show();
+      do {
+        $wrapper = $wrapper.closest('fieldset.field-group-fieldset').toggle($wrapper.children('.form-wrapper:visible').length > 0).closest('.fieldset-wrapper');
+      } while ($wrapper.length);
+    }
+  }
+});
+
 })(jQuery);