diff --git a/templates/elements/details.html.twig b/templates/elements/details.html.twig
index 9afefceda4f1ff4ed9b10ad3cca1c159fe18ec60..07ab4915346bf0c83f858afdc397beb1407c77ee 100644
--- a/templates/elements/details.html.twig
+++ b/templates/elements/details.html.twig
@@ -30,7 +30,7 @@ Prefix 'details' class to avoid collision with Modernizr.
     ]
     %}
     <summary{{ summary_attributes.addClass(summary_classes) }}>
-      <label for="{{ element['#id'] }}">{{ title }}</label>
+      <label for="{{ form_field_id }}">{{ title }}</label>
     </summary>
   {%- endif -%}
   <div class="seven-details__wrapper details-wrapper">
diff --git a/uw_fdsu_theme_resp.theme b/uw_fdsu_theme_resp.theme
index cdec19c6cc9d42740b67b295b2b78fe3ed1bca5d..05f12bf9ff9b4de225b2b035ca05c4bbb47ea185 100644
--- a/uw_fdsu_theme_resp.theme
+++ b/uw_fdsu_theme_resp.theme
@@ -687,3 +687,17 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) {
     }
   }
 }
+
+/**
+ * Implements template_preprocess_details().
+ */
+function uw_fdsu_theme_resp_preprocess_details(&$variables) {
+
+  // Add the form field id to the variables.
+  // This comes from ISTWCMS-6711, we are
+  // removing the -collapsible if there is
+  // one there and using the html id.  If there
+  // is no -collapsible, it will just use the
+  // html id.
+  $variables['form_field_id'] = str_replace('-collapsible', '', $variables['attributes']['id']);
+}