diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockContentBlockTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockContentBlockTest.php
index 6cce785c99..a25b64999a 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockContentBlockTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockContentBlockTest.php
@@ -57,19 +57,13 @@ protected function setUp() {
         ],
       ],
     ]);
-
-    $bundle = BlockContentType::create([
-      'id' => 'basic',
-      'label' => 'Basic block',
-    ]);
-    $bundle->save();
-    block_content_add_body_field($bundle->id());
   }
 
   /**
    * {@inheritdoc}
    */
   public function testInlineBlocks() {
+    $this->createBlockContentType('basic', 'Basic block');
     $assert_session = $this->assertSession();
     $page = $this->getSession()->getPage();
 
@@ -178,4 +172,79 @@ public function testInlineBlocks() {
     $assert_session->elementsCount('css', '.block-inline-block-contentbasic', 1);
   }
 
+  /**
+   * Tests the workflow for adding an inline block depending on number of types.
+   *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   * @throws \Behat\Mink\Exception\ExpectationException
+   */
+  public function testAddWorkFlow() {
+    $assert_session = $this->assertSession();
+    $page = $this->getSession()->getPage();
+
+    $this->drupalLogin($this->drupalCreateUser([
+      'access contextual links',
+      'configure any layout',
+      'administer node display',
+      'administer node fields',
+    ]));
+
+    $layout_default_path = 'admin/structure/types/manage/bundle_with_section_field/display-layout/default';
+    $this->drupalGet($layout_default_path);
+    // Add a basic block with the body field set.
+    $page->clickLink('Add Block');
+    $assert_session->assertWaitOnAjaxRequest();
+    // Confirm that with no block content types the link does not appear.
+    $assert_session->linkNotExists('Add new Block');
+
+    $this->createBlockContentType('basic', 'Basic block');
+
+    $this->drupalGet($layout_default_path);
+    // Add a basic block with the body field set.
+    $page->clickLink('Add Block');
+    $assert_session->assertWaitOnAjaxRequest();
+    // Confirm with only 1 type the "Add new Block" link goes directly to block
+    // add form.
+    $assert_session->linkNotExists('Basic block');
+    $this->clickLink('Add new Block');
+    $assert_session->assertWaitOnAjaxRequest();
+    $assert_session->fieldExists('Title');
+
+    $this->createBlockContentType('advanced', 'Advanced block');
+
+    $this->drupalGet($layout_default_path);
+    // Add a basic block with the body field set.
+    $page->clickLink('Add Block');
+    // Confirm more than 1 type exists "Add new block" shows a list block types.
+    $assert_session->assertWaitOnAjaxRequest();
+    $assert_session->linkNotExists('Basic block');
+    $assert_session->linkNotExists('Advanced block');
+    $this->clickLink('Add new Block');
+    $assert_session->assertWaitOnAjaxRequest();
+    $assert_session->fieldNotExists('Title');
+    $assert_session->linkExists('Basic block');
+    $assert_session->linkExists('Advanced block');
+
+    $this->clickLink('Advanced block');
+    $assert_session->assertWaitOnAjaxRequest();
+    $assert_session->fieldExists('Title');
+  }
+
+  /**
+   * Creates a block content type.
+   *
+   * @param string $id
+   *   The block type id.
+   * @param string $label
+   *   The block type label.
+   */
+  protected function createBlockContentType($id, $label) {
+    $bundle = BlockContentType::create([
+      'id' => $id,
+      'label' => $label,
+    ]);
+    $bundle->save();
+    block_content_add_body_field($bundle->id());
+  }
+
 }