diff --git a/ghost/admin/app/components/modal-post-preview.hbs b/ghost/admin/app/components/modal-post-preview.hbs
index d3a59f9a49..92eeccdbcc 100644
--- a/ghost/admin/app/components/modal-post-preview.hbs
+++ b/ghost/admin/app/components/modal-post-preview.hbs
@@ -9,29 +9,33 @@
         <div class="gh-contentfilter gh-btn-group gh-post-preview-btn-group" style="display:flex;flex-grow:1;justify-content:center">
             <button type="button" class="gh-btn {{if (eq this.tab "browser") "gh-btn-group-selected"}} gh-post-preview-mode" {{on "click" (fn this.changeTab "browser")}}><span>{{svg-jar "desktop"}}</span></button>
             <button type="button" class="gh-btn {{if (eq this.tab "mobile") "gh-btn-group-selected"}} gh-post-preview-mode" {{on "click" (fn this.changeTab "mobile")}}><span>{{svg-jar "mobile-phone"}}</span></button>
-            {{#if this.model.isPost}}
+            {{#if @model.post.isPost}}
                 <button type="button" class="gh-btn {{if (eq this.tab "email") "gh-btn-group-selected"}} gh-post-preview-mode" {{on "click" (fn this.changeTab "email")}}><span>{{svg-jar "email-unread"}}</span></button>
             {{/if}}
             <button type="button" class="gh-btn {{if (eq this.tab "social") "gh-btn-group-selected"}} gh-post-preview-mode" {{on "click" (fn this.changeTab "social")}}><span>{{svg-jar "social-share"}}</span></button>
         </div>
-        <button class="fr ml9 gh-btn gh-btn-blue gh-button-icon" type="button" title="Publish" {{on "click" this.close}}>
-            <span>Publish</span>
-        </button>
+
+        <GhPublishmenu
+            @post={{@model.post}}
+            @postStatus={{@model.post.status}}
+            @saveTask={{@model.saveTask}}
+            @setSaveType={{@model.setEditorSaveType}}
+            @memberCount={{@model.memberCount}} />
     </header>
 
     {{#if (eq this.tab "browser")}}
-        <ModalPostPreview::Browser @post={{@model}} />
+        <ModalPostPreview::Browser @post={{@model.post}} />
     {{/if}}
 
-    {{#if (and (eq this.tab "mobile") this.model.isPost)}}
-        <ModalPostPreview::Mobile @post={{@model}} />
+    {{#if (and (eq this.tab "mobile") @model.post.isPost)}}
+        <ModalPostPreview::Mobile @post={{@model.post}} />
     {{/if}}
 
-    {{#if (and (eq this.tab "email") this.model.isPost)}}
-        <ModalPostPreview::Email @post={{@model}} />
+    {{#if (and (eq this.tab "email") @model.post.isPost)}}
+        <ModalPostPreview::Email @post={{@model.post}} />
     {{/if}}
 
     {{#if (eq this.tab "social")}}
-        <ModalPostPreview::Social @post={{@model}} />
+        <ModalPostPreview::Social @post={{@model.post}} />
     {{/if}}
 </div>
\ No newline at end of file
diff --git a/ghost/admin/app/controllers/editor.js b/ghost/admin/app/controllers/editor.js
index 4feb681cbe..058b497940 100644
--- a/ghost/admin/app/controllers/editor.js
+++ b/ghost/admin/app/controllers/editor.js
@@ -429,6 +429,7 @@ export default Controller.extend({
             post.set('statusScratch', null);
 
             if (!options.silent) {
+                this.set('showPostPreviewModal', false);
                 this._showSaveNotification(prevStatus, post.get('status'), isNew ? true : false);
             }
 
@@ -749,6 +750,7 @@ export default Controller.extend({
         this.set('shouldFocusEditor', false);
         this.set('leaveEditorTransition', null);
         this.set('showLeaveEditorModal', false);
+        this.set('showPostPreviewModal', false);
         this.set('infoMessage', null);
         this.set('wordCount', null);
 
diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css
index 68de021ff5..f75b61b82e 100644
--- a/ghost/admin/app/styles/components/publishmenu.css
+++ b/ghost/admin/app/styles/components/publishmenu.css
@@ -53,6 +53,7 @@
     font-size: 1.4rem;
     font-weight: normal;
     will-change: transform, opacity;
+    z-index: 99999; /* needs to sit on top of preview modal */
 }
 
 .gh-publishmenu-dropdown.ember-basic-dropdown--transitioning-in {
diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs
index f7c18ed64f..5f11487282 100644
--- a/ghost/admin/app/templates/editor.hbs
+++ b/ghost/admin/app/templates/editor.hbs
@@ -121,7 +121,12 @@
 
     {{#if this.showPostPreviewModal}}
         <GhFullscreenModal @modal="post-preview"
-            @model={{this.post}}
+            @model={{hash
+                post=this.post
+                saveTask=this.save
+                setEditorSaveType=(action "setSaveType")
+                memberCount=this.memberCount
+            }}
             @close={{action "togglePostPreviewModal"}}
             @modifier="full-overlay email-preview" />
     {{/if}}