diff --git a/ghost/admin/app/components/modal-post-success.hbs b/ghost/admin/app/components/modal-post-success.hbs
index 745f2df0fe..9174b2659d 100644
--- a/ghost/admin/app/components/modal-post-success.hbs
+++ b/ghost/admin/app/components/modal-post-success.hbs
@@ -7,7 +7,9 @@
 
     <header class="modal-header">
         <h1>
-            {{#unless this.post.isScheduled}}
+            {{#if this.post.isScheduled}}
+                <span>All set!</span>
+            {{else}}
                 <span>Boom! It's out there.</span>
                 <span>
                     {{#if this.post.emailOnly}}
@@ -20,9 +22,7 @@
                         {{/if}}
                     {{/if}}
                 </span>
-            {{else}}
-                <span>All set!</span>
-            {{/unless}}
+            {{/if}}
         </h1>
     </header>
 
@@ -63,7 +63,7 @@
                 {{/let}}
             {{/if}}
 
-            {{#let (moment-site-tz post.publishedAtUTC) as |publishedAt|}}
+            {{#let (moment-site-tz this.post.publishedAtUTC) as |publishedAt|}}
                 on
                 {{moment-format publishedAt "D MMM YYYY"}}
                 at
diff --git a/ghost/admin/app/components/posts/analytics.hbs b/ghost/admin/app/components/posts/analytics.hbs
index 102fbd820f..e9f3a5a5b9 100644
--- a/ghost/admin/app/components/posts/analytics.hbs
+++ b/ghost/admin/app/components/posts/analytics.hbs
@@ -34,19 +34,15 @@
                         {{moment-format publishedAt "HH:mm"}}
                     {{/let}}
                 </div>
-                {{#unless (feature "publishFlowEndScreen")}}
-                    <LinkTo @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}} class="gh-post-list-cta edit" title="">
-                        {{svg-jar "pen" title=""}}<span>Edit post</span>
-                    </LinkTo>
-                {{else}}
+                {{#if (feature "publishFlowEndScreen")}}
                     <div style="display: flex; gap: 4px;">
                         {{#if (feature "publishFlowEndScreen")}}
-                            <button class="gh-post-list-cta edit" {{on "click" this.fetchPostTask.perform}}>
+                            <button type="button" class="gh-post-list-cta edit" {{on "click" this.fetchPostTask.perform}}>
                                 {{svg-jar "reload" title="Refresh post analytics"}}<span>Refresh</span>
                             </button>
                         {{/if}}
                         {{#unless this.post.emailOnly}}
-                            <button class="gh-post-list-cta edit" {{on "click" this.togglePublishFlowModal}}>
+                            <button type="button" class="gh-post-list-cta edit" {{on "click" this.togglePublishFlowModal}}>
                                 {{svg-jar "share" title="Share post"}}<span>Share</span>
                             </button>
                         {{/unless}}
@@ -73,7 +69,7 @@
                                     <LinkTo @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}}>Edit post</LinkTo>
                                 </li>
                                 <li>
-                                    <a href="{{this.post.url}}" target="_blank" rel="noreferrer">View in browser</a>
+                                    <a href="{{this.post.url}}" target="_blank" rel="noopener noreferrer">View in browser</a>
                                 </li>
                                 <li>
                                     <button
@@ -88,7 +84,11 @@
                             </GhDropdown>
                         </span>
                     </div>
-                {{/unless}}
+                {{else}}
+                    <LinkTo @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}} class="gh-post-list-cta edit" title="">
+                        {{svg-jar "pen" title=""}}<span>Edit post</span>
+                    </LinkTo>
+                {{/if}}
             </div>
         </div>
     </GhCanvasHeader>