diff --git a/modules/paragraphs_demo/src/Tests/ParagraphsDemoTest.php b/modules/paragraphs_demo/src/Tests/ParagraphsDemoTest.php
index ab63a1a..690ee9e 100644
--- a/modules/paragraphs_demo/src/Tests/ParagraphsDemoTest.php
+++ b/modules/paragraphs_demo/src/Tests/ParagraphsDemoTest.php
@@ -117,7 +117,10 @@ class ParagraphsDemoTest extends WebTestBase {
     $this->assertNoFieldChecked('edit-settings-handler-settings-target-bundles-drag-drop-text-enabled');
 
     $this->drupalGet('node/add/paragraphed_content_demo');
+    $this->assertRaw('<strong data-drupal-selector="edit-field-paragraphs-demo-title">Paragraphs</strong>', 'Field name is present on the page.');
     $this->drupalPostForm(NULL, NULL, t('Add Text'));
+    $this->assertNoRaw('<strong data-drupal-selector="edit-field-paragraphs-demo-title">Paragraphs</strong>', 'Field name for empty field is not present on the page.');
+    $this->assertRaw('<h4 class="label">Paragraphs</h4>', 'Field name appears in the table header.');
     $edit = array(
       'title[0][value]' => 'Paragraph title',
       'field_paragraphs_demo[0][subform][field_text_demo][0][value]' => 'Paragraph text',
diff --git a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
index cb54418..2221b48 100644
--- a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
+++ b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
@@ -733,23 +733,37 @@ class InlineParagraphsWidget extends WidgetBase {
         '#description' => $description,
         '#max_delta' => $max-1,
       );
-    } else {
-
-      // @todo: properize this.
-      $element_text = '<p><em>' . t('No @title added yet.', ['@title' => $this->getSetting('title')]) . '</em></p>';
-      $element_text .= $description ? '<div class="description">' . $description . '</div>' : '';
-
-      $elements += array(
+    }
+    else {
+      $elements += [
         '#type' => 'container',
-        '#theme_wrappers' => array('container'),
+        '#theme_wrappers' => ['container'],
         '#field_name' => $field_name,
         '#cardinality' => $cardinality,
         '#cardinality_multiple' => TRUE,
         '#max_delta' => $max-1,
-        'text' => array(
-          '#markup' => $element_text,
-        ),
-      );
+        'title' => [
+          '#type' => 'html_tag',
+          '#tag' => 'strong',
+          '#value' => $title,
+        ],
+        'text' => [
+          '#type' => 'container',
+          'value' => [
+            '#markup' => $this->t('No @title added yet.', ['@title' => $this->getSetting('title')]),
+            '#prefix' => '<em>',
+            '#suffix' => '</em>',
+          ]
+        ],
+      ];
+
+      if ($description) {
+        $elements['description'] = [
+          '#type' => 'container',
+          'value' => ['#markup' => $description],
+          '#attributes' => ['class' => ['description']],
+        ];
+      }
     }
 
     // Add 'add more' button, if not working with a programmed form.