diff --git a/src/dialogs/config-flow/previews/flow-preview-group.ts b/src/dialogs/config-flow/previews/flow-preview-group.ts
index 25f6d3cb08..11d48cd09f 100644
--- a/src/dialogs/config-flow/previews/flow-preview-group.ts
+++ b/src/dialogs/config-flow/previews/flow-preview-group.ts
@@ -49,7 +49,7 @@ class FlowPreviewGroup extends LitElement {
   private _setPreview = (preview: GroupPreview) => {
     const now = new Date().toISOString();
     this._preview = {
-      entity_id: `${this.stepId}.flow_preview`,
+      entity_id: `${this.stepId}.___flow_preview___`,
       last_changed: now,
       last_updated: now,
       context: { id: "", parent_id: null, user_id: null },
diff --git a/src/dialogs/config-flow/previews/flow-preview-template.ts b/src/dialogs/config-flow/previews/flow-preview-template.ts
index ebd5eb503a..fd337671e3 100644
--- a/src/dialogs/config-flow/previews/flow-preview-template.ts
+++ b/src/dialogs/config-flow/previews/flow-preview-template.ts
@@ -110,11 +110,11 @@ class FlowPreviewTemplate extends LitElement {
             </ul>
           `
         : !this._listeners.time
-        ? html`<span class="all_listeners">
+        ? html`<p class="all_listeners">
             ${this.hass.localize(
               "ui.dialogs.helper_settings.template.no_listeners"
             )}
-          </span>`
+          </p>`
         : nothing} `;
   }
 
@@ -128,7 +128,7 @@ class FlowPreviewTemplate extends LitElement {
     this._listeners = preview.listeners;
     const now = new Date().toISOString();
     this._preview = {
-      entity_id: `${this.stepId}.flow_preview`,
+      entity_id: `${this.stepId}.___flow_preview___`,
       last_changed: now,
       last_updated: now,
       context: { id: "", parent_id: null, user_id: null },