diff --git a/core/modules/layout_builder/layout_builder.links.contextual.yml b/core/modules/layout_builder/layout_builder.links.contextual.yml
index 4af753702d..c2c7bff44d 100644
--- a/core/modules/layout_builder/layout_builder.links.contextual.yml
+++ b/core/modules/layout_builder/layout_builder.links.contextual.yml
@@ -26,4 +26,4 @@ layout_builder_block_visibility:
     attributes:
       class: ['use-ajax']
       data-dialog-type: dialog
-      data-dialog-renderer: off_canvas
\ No newline at end of file
+      data-dialog-renderer: off_canvas
diff --git a/core/modules/layout_builder/src/Form/ConfigureVisibility.php b/core/modules/layout_builder/src/Form/ConfigureVisibility.php
index 7967be457e..6e0a620df6 100644
--- a/core/modules/layout_builder/src/Form/ConfigureVisibility.php
+++ b/core/modules/layout_builder/src/Form/ConfigureVisibility.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Uuid\UuidInterface;
 use Drupal\Core\Condition\ConditionInterface;
 use Drupal\Core\Condition\ConditionManager;
+use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Form\SubformState;
@@ -98,12 +99,15 @@ class ConfigureVisibility extends FormBase {
    *   The uuid generator.
    * @param \Drupal\Core\Plugin\PluginFormFactoryInterface $plugin_form_manager
    *   The plugin form manager.
+   * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
+   *   The class resolver.
    */
-  public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ConditionManager $condition_manager, UuidInterface $uuid_generator, PluginFormFactoryInterface $plugin_form_manager) {
+  public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ConditionManager $condition_manager, UuidInterface $uuid_generator, PluginFormFactoryInterface $plugin_form_manager, ClassResolverInterface $class_resolver) {
     $this->layoutTempstoreRepository = $layout_tempstore_repository;
     $this->conditionManager = $condition_manager;
     $this->uuidGenerator = $uuid_generator;
     $this->pluginFormFactory = $plugin_form_manager;
+    $this->classResolver = $class_resolver;
   }
 
   /**
@@ -114,7 +118,8 @@ public static function create(ContainerInterface $container) {
       $container->get('layout_builder.tempstore_repository'),
       $container->get('plugin.manager.condition'),
       $container->get('uuid'),
-      $container->get('plugin_form.factory')
+      $container->get('plugin_form.factory'),
+      $container->get('class_resolver')
     );
   }