diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo
index 7e7f29dfc0..64f7538b88 100644
--- a/ghost/admin/.lint-todo
+++ b/ghost/admin/.lint-todo
@@ -1164,3 +1164,5 @@ remove|ember-template-lint|no-action|96|43|96|43|659c404406f04b8153690817989630a
 remove|ember-template-lint|no-passed-in-event-handlers|95|32|95|32|50acf938ca8cb3c5633b20e7050d7750211b12f4|1652054400000|1662422400000|1665014400000|app/templates/settings/general.hbs
 add|ember-template-lint|require-input-label|48|12|48|12|16e2b28dce448cbd2dd1cdc10211c43a7d0ca021|1652400000000|1662768000000|1667955600000|app/components/editor-labs/modals/preview/email.hbs
 remove|ember-template-lint|require-input-label|19|8|19|8|aefef8f18b7648ad42353400a95bf5d4ccc426bc|1652227200000|1662595200000|1667782800000|app/components/editor-labs/modals/preview/email.hbs
+remove|ember-template-lint|no-action|2|48|2|48|74d234e67cc2c695fd41431692bb2974c2feddcf|1652054400000|1662422400000|1665014400000|app/templates/editor.hbs
+remove|ember-template-lint|no-action|35|108|35|108|374dcf5faec6721e81711cb589f7966ab6063a14|1652054400000|1662422400000|1665014400000|app/templates/editor.hbs
diff --git a/ghost/admin/app/components/editor-labs/publish-management.hbs b/ghost/admin/app/components/editor-labs/publish-management.hbs
index 4ce8a96a58..fd0fd136f7 100644
--- a/ghost/admin/app/components/editor-labs/publish-management.hbs
+++ b/ghost/admin/app/components/editor-labs/publish-management.hbs
@@ -1,5 +1,5 @@
 {{#if @post.isDraft}}
-    <div>
+    <div {{on-key "cmd+p" this.togglePreview}}>
         <button type="button" class="gh-btn gh-editor-preview-trigger" {{on "click" this.openPreview}}>
             <span>Preview</span>
         </button>
diff --git a/ghost/admin/app/components/editor-labs/publish-management.js b/ghost/admin/app/components/editor-labs/publish-management.js
index b10e7efa11..96dbca3d6d 100644
--- a/ghost/admin/app/components/editor-labs/publish-management.js
+++ b/ghost/admin/app/components/editor-labs/publish-management.js
@@ -98,6 +98,22 @@ export default class PublishManagement extends Component {
         }
     }
 
+    // triggered by ctrl/cmd+p
+    @action
+    togglePreview(event) {
+        event?.preventDefault();
+
+        if (!this.previewModal || this.previewModal.isClosing) {
+            if (this.publishFlowModal && !this.publishFlowModal.isClosing) {
+                this.togglePreviewPublish();
+            } else {
+                this.openPreview();
+            }
+        } else {
+            this.previewModal.close();
+        }
+    }
+
     @action
     changePreviewTab(tab) {
         this.previewTab = tab;
diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs
index 731c147756..1de058d8c9 100644
--- a/ghost/admin/app/templates/editor.hbs
+++ b/ghost/admin/app/templates/editor.hbs
@@ -1,5 +1,5 @@
 {{#if this.post}}
-    <div class="flex flex-row" {{on-key "cmd+p" (action "openPostPreview")}}>
+    <div class="flex flex-row">
         <GhEditor
             @tagName="section"
             @class="gh-editor gh-view relative"
@@ -28,15 +28,15 @@
 
                 <section class="flex" style="pointer-events: auto">
                     {{#unless this.post.isNew}}
-                        {{#if (and this.post.isDraft (not (feature "publishingFlow")))}}
-                            <div>
-                                <button type="button" class="gh-btn gh-editor-preview-trigger" {{on "click" (action "openPostPreviewModal")}}>
-                                    <span>Preview</span>
-                                </button>
-                            </div>
-                        {{/if}}
-
                         {{#if this.session.user.isContributor}}
+                            {{#if this.post.isDraft}}
+                                <div {{on-key "cmd+p" this.openPostPreview}}>
+                                    <button type="button" class="gh-btn gh-editor-preview-trigger" {{on "click" this.openPostPreviewModal}}>
+                                        <span>Preview</span>
+                                    </button>
+                                </div>
+                            {{/if}}
+
                             <GhTaskButton @buttonText="Save"
                                 @task={{this.save}}
                                 @runningText="Saving"