diff --git a/core/modules/field_ui/src/Form/FieldStorageAddForm.php b/core/modules/field_ui/src/Form/FieldStorageAddForm.php
index b355491..3b38e2e 100644
--- a/core/modules/field_ui/src/Form/FieldStorageAddForm.php
+++ b/core/modules/field_ui/src/Form/FieldStorageAddForm.php
@@ -155,13 +155,12 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
         ],
       ],
     ];
-    $i = 0;
     foreach ($ui_definitions as $category => $field_types) {
       foreach ($field_types as $name => $field_type) {
         if (empty($field_type['description'])) {
           continue;
         }
-        $form['description_wrapper']["description_{$name}_{$i}"] = [
+        $form['description_wrapper']["description_{$name}"] = [
           '#type' => 'container',
           '#states' => [
             'visible' => [
@@ -169,10 +168,9 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
             ],
           ],
         ];
-        $form['description_wrapper']["description_{$name}_{$i}"]['description'] = [
+        $form['description_wrapper']["description_{$name}"]['description'] = [
           '#markup' => $field_type['description'],
         ];
-        $i++;
       }
     }
 
diff --git a/core/modules/field_ui/tests/src/FunctionalJavascript/UiDescriptionsTest.php b/core/modules/field_ui/tests/src/FunctionalJavascript/UiDescriptionsTest.php
index f6ec8d3..806c9bd 100644
--- a/core/modules/field_ui/tests/src/FunctionalJavascript/UiDescriptionsTest.php
+++ b/core/modules/field_ui/tests/src/FunctionalJavascript/UiDescriptionsTest.php
@@ -47,10 +47,10 @@ public function testFieldDescriptions() {
     // Check that the description wrapper is only visible after you select that
     // element from the list.
     $assert_session->optionExists('edit-new-storage-type', 'boolean');
-    $boolean_description_element = $assert_session->elementExists('css', '#edit-description-boolean-0');
+    $boolean_description_element = $assert_session->elementExists('css', '#edit-description-boolean');
     $this->assertFalse($boolean_description_element->isVisible());
     $page->selectFieldOption('edit-new-storage-type', 'boolean');
-    $boolean_description_element = $assert_session->elementExists('css', '#edit-description-boolean-0');
+    $boolean_description_element = $assert_session->elementExists('css', '#edit-description-boolean');
     $this->assertTrue($boolean_description_element->isVisible());
 
     // Make sure the expected texts from the plugin annotations (or overriden