diff --git a/ghost/admin/app/components/gh-editor-post-status.hbs b/ghost/admin/app/components/gh-editor-post-status.hbs
index 8560a5bf7a..3997d7f484 100644
--- a/ghost/admin/app/components/gh-editor-post-status.hbs
+++ b/ghost/admin/app/components/gh-editor-post-status.hbs
@@ -8,6 +8,7 @@
         {{else if (eq @post.email.status "submitted")}}
             and sent to {{gh-pluralize @post.email.emailCount "member"}}
         {{/if}}
+        {{if (not @hasDirtyAttributes) "- Saved"}}
     {{else if @post.isScheduled}}
         <time datetime="{{@post.publishedAtUTC}}" class="ml1 green f8" data-test-schedule-countdown>
             Will be published
@@ -16,9 +17,10 @@
             {{/if}}
             {{this.scheduledTime}}
         </time>
+        {{if (not @hasDirtyAttributes) "- Saved"}}
     {{else if @post.isNew}}
         New
     {{else}}
-        Draft
+        Draft {{if (not @hasDirtyAttributes) "- Saved"}}
     {{/if}}
 </div>
\ No newline at end of file
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index 6e68f3bf3a..ac0ec8375e 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -56,6 +56,7 @@ export default Service.extend({
     matchHelper: feature('matchHelper'),
     multipleProducts: feature('multipleProducts', {developer: true}),
     emailCardSegments: feature('emailCardSegments', {developer: true}),
+    savedIndicator: feature('savedIndicator', {developer: true}),
 
     _user: null,
 
diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs
index 03f1c89fbf..bf528a6ecf 100644
--- a/ghost/admin/app/templates/editor.hbs
+++ b/ghost/admin/app/templates/editor.hbs
@@ -21,6 +21,7 @@
                         <span>
                             <GhEditorPostStatus
                                 @post={{this.post}}
+                                @hasDirtyAttributes={{this.hasDirtyAttributes}}
                                 @isSaving={{or this.autosaveTask.isRunning this.saveTasks.isRunning}}
                             />
                         </span>
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 0ddb00c7ba..eb50d6035e 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -280,6 +280,19 @@
                         </div>
                     </div>
                 </div>
+                <div class="gh-expandable-block">
+                    <div class="gh-expandable-header">
+                        <div>
+                            <h4 class="gh-expandable-title">Show saved state in editor</h4>
+                            <p class="gh-expandable-description">
+                                Post status in editor shows "- Saved" when a post has no unsaved changes
+                            </p>
+                        </div>
+                        <div class="for-switch">
+                           <GhFeatureFlag @flag="savedIndicator" />
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         {{/if}}