diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index eae359c4b26a4..054594ff9e9f2 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -496,10 +496,15 @@ define([
             }
 
             // toggle target row
-            headElement = $(idTo + '-head');
+            headElement = jQuery('#' + idTo + '-head');
             isInheritCheckboxChecked = $(idTo + '_inherit') && $(idTo + '_inherit').checked;
             target = $(idTo);
 
+            // Account for the chooser style parameters.
+            if (target === null && headElement.length === 0 && idTo.substring(0, 16) === 'options_fieldset') {
+                headElement = jQuery('.field-' + idTo).add('.field-chooser' + idTo);
+            }
+
             // Target won't always exist (for example, if field type is "label")
             if (target) {
                 inputs = target.up(this._config['levels_up']).select('input', 'select', 'td');
@@ -529,10 +534,10 @@ define([
                     });
                 }
 
-                if (headElement) {
+                if (headElement.length > 0) {
                     headElement.show();
 
-                    if (headElement.hasClassName('open') && target) {
+                    if (headElement.hasClass('open') && target) {
                         target.show();
                     } else if (target) {
                         target.hide();
@@ -567,7 +572,7 @@ define([
                     });
                 }
 
-                if (headElement) {
+                if (headElement.length > 0) {
                     headElement.hide();
                 }