diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index e8c27c8..7051e1e 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -215,7 +215,11 @@ function template_preprocess_system_modules_details(&$variables) {
     $id = Html::getUniqueId('module-' . $key);
     $module['id'] = $id;
     $module['enable_id'] = $module['enable']['#id'];
-    $module['machine_name'] = $key;
+    $module['machine_name'] = [
+      '#prefix' => '<span dir="ltr" class="table-filter-text-source">',
+      '#plain_text' => $key,
+      '#suffix' => '</span>',
+    ];
 
     // @todo Remove early rendering and use safe_join in the Twig template once
     //   https://www.drupal.org/node/2579091 is fixed.
diff --git a/core/modules/system/templates/system-modules-details.html.twig b/core/modules/system/templates/system-modules-details.html.twig
index 540acce..c8e9699 100644
--- a/core/modules/system/templates/system-modules-details.html.twig
+++ b/core/modules/system/templates/system-modules-details.html.twig
@@ -54,7 +54,7 @@
         </td>
         <td class="description expand priority-low">
           <details class="js-form-wrapper form-wrapper" id="{{ module.enable_id }}-description">
-            <summary aria-controls="{{ module.id }}" role="button"><span class="text module-description">{{ module.description }}</span></summary>
+            <summary aria-controls="{{ module.enable_id }}" role="button" aria-expanded="false"><span class="text module-description">{{ module.description }}</span></summary>
             <div class="details-wrapper">
               <div class="details-description">
                 <div class="requirements">