diff --git a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
index 9cee08e70a..93ebc9862b 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
@@ -262,7 +262,11 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
         ],
       ];
       if ($entity_type->hasKey('bundle')) {
-        $form['sort']['settings']['direction']['#states']['visible'][] = [':input[name^="settings[handler_settings][target_bundles]["]' => ['checked' => TRUE]];
+        $form['sort']['settings']['direction']['#states']['visible'][] = 
+        [':input[name^="settings[handler_settings][target_bundles]["]' => [
+          'checked' => TRUE
+          ]
+        ];
       }
 
     }
diff --git a/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
index ab9ea276c2..2901ed516b 100644
--- a/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
+++ b/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
@@ -163,14 +163,14 @@ public function testFieldAdminHandler() {
     $sort_by->setValue('nid');
     $assert_session->assertWaitOnAjaxRequest();
     foreach ($bundles as $bundle_name => $bundle_info) {
-      $this->assertFieldByName('settings[handler_settings][target_bundles][' . $bundle_name . ']');
+      $this->assertSession()->fieldExists('settings[handler_settings][target_bundles][' . $bundle_name . ']');
       $page->findField('settings[handler_settings][target_bundles][' . $bundle_name . ']')->uncheck();
       $assert_session->assertWaitOnAjaxRequest();
     }
     $sort_direction = $page->findField('settings[handler_settings][sort][direction]');
     $this->assertFalse($sort_direction->isVisible());
     foreach ($bundles as $bundle_name => $bundle_info) {
-      $this->assertFieldByName('settings[handler_settings][target_bundles][' . $bundle_name . ']');
+      $this->assertSession()->fieldExists('settings[handler_settings][target_bundles][' . $bundle_name . ']');
       $page->findField('settings[handler_settings][target_bundles][' . $bundle_name . ']')->setValue($bundle_name);
       $sort_direction = $page->findField('settings[handler_settings][sort][direction]');
     }