diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index 0c7ac3d27d..3c9e1a13b1 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -13,13 +13,13 @@
   export let idx
   export let addLooping
   export let deleteStep
-
+  export let enableNaming = true
   let validRegex = /^[A-Za-z0-9_\s]+$/
   let typing = false
 
   const dispatch = createEventDispatcher()
 
-  $: stepNames = $selectedAutomation.definition.stepNames
+  $: stepNames = $selectedAutomation?.definition.stepNames
   $: automationName = stepNames?.[block.id] || block?.name || ""
   $: automationNameError = getAutomationNameError(automationName)
   $: status = updateStatus(testResult, isTrigger)
@@ -32,7 +32,7 @@
       )?.[0]
     }
   }
-  $: loopBlock = $selectedAutomation.definition.steps.find(
+  $: loopBlock = $selectedAutomation?.definition.steps.find(
     x => x.blockToLoop === block?.id
   )
 
@@ -126,24 +126,33 @@
             <Body size="XS"><b>Step {idx}</b></Body>
           </div>
         {/if}
-        <input
-          placeholder="Enter some text"
-          name="name"
-          autocomplete="off"
-          value={automationName}
-          on:input={e => {
-            automationName = e.target.value.trim()
-          }}
-          on:click={startTyping}
-          on:blur={async () => {
-            typing = false
-            if (automationNameError) {
-              automationName = stepNames[block.id] || block?.name
-            } else {
-              await saveName()
-            }
-          }}
-        />
+
+        {#if enableNaming}
+          <input
+            class="input-text"
+            disabled={!enableNaming}
+            placeholder="Enter some text"
+            name="name"
+            autocomplete="off"
+            value={automationName}
+            on:input={e => {
+              automationName = e.target.value.trim()
+            }}
+            on:click={startTyping}
+            on:blur={async () => {
+              typing = false
+              if (automationNameError) {
+                automationName = stepNames[block.id] || block?.name
+              } else {
+                await saveName()
+              }
+            }}
+          />
+        {:else}
+          <div class="input-text">
+            {automationName}
+          </div>
+        {/if}
       </div>
     </div>
     <div class="blockTitle">
@@ -178,9 +187,11 @@
               <Icon on:click={addLooping} hoverable name="RotateCW" />
             </AbsTooltip>
           {/if}
-          <AbsTooltip type="negative" text="Delete step">
-            <Icon on:click={deleteStep} hoverable name="DeleteOutline" />
-          </AbsTooltip>
+          {#if !isHeaderTrigger}
+            <AbsTooltip type="negative" text="Delete step">
+              <Icon on:click={deleteStep} hoverable name="DeleteOutline" />
+            </AbsTooltip>
+          {/if}
         {/if}
         {#if !showTestStatus}
           <Icon
@@ -244,18 +255,21 @@
     display: none;
   }
   input {
-    font-family: var(--font-sans);
     color: var(--ink);
     background-color: transparent;
     border: 1px solid transparent;
-    font-size: var(--spectrum-alias-font-size-default);
     width: 230px;
     box-sizing: border-box;
     overflow: hidden;
-    text-overflow: ellipsis;
     white-space: nowrap;
   }
 
+  .input-text {
+    font-size: var(--spectrum-alias-font-size-default);
+    font-family: var(--font-sans);
+    text-overflow: ellipsis;
+  }
+
   input:focus {
     outline: none;
   }
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
index aa441cec40..89406f15d8 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
@@ -48,6 +48,7 @@
     <div class="block" style={width ? `width: ${width}` : ""}>
       {#if block.stepId !== ActionStepID.LOOP}
         <FlowItemHeader
+          enableNaming={false}
           open={!!openBlocks[block.id]}
           on:toggle={() => (openBlocks[block.id] = !openBlocks[block.id])}
           isTrigger={idx === 0}
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
index 5b9c925130..cde76fa1c0 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
@@ -56,7 +56,7 @@
     {/if}
     {#key history}
       <div class="history">
-        <TestDisplay testResults={history} width="100%" />
+        <TestDisplay testResults={history} width="320px" />
       </div>
     {/key}
   </Layout>
