diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index a1b48508546..62a50dbc0b6 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -164,7 +164,9 @@
                 {{/if}}
                 {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
                 {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
-                {{model.draftStatus}}
+                {{#if model.draftStatus}}
+                  <span title="{{model.draftStatus}}">{{d-icon 'user-edit'}}</span>
+                {{/if}}
               </div>
             </div>
 
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 2ab2284ad89..283bb99e02d 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -307,6 +307,11 @@
         margin-right: 5px;
       }
     }
+    #draft-status .d-icon-user-edit {
+      color: $danger;
+      font-size: 20px;
+      vertical-align: -5.5px;
+    }
   }
 
   .composer-bottom-right {
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 9e82144ac83..19d0a006a05 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -181,6 +181,7 @@ module SvgSprite
     "unlock-alt",
     "upload",
     "user",
+    "user-edit",
     "user-plus",
     "user-secret",
     "user-times",
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
index e1025ffc588..ee4d22e4c4d 100644
--- a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
+++ b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
@@ -4,7 +4,7 @@ acceptance("Composer - Edit conflict", {
   loggedIn: true
 });
 
-QUnit.skip("Edit a post that causes an edit conflict", async assert => {
+QUnit.test("Edit a post that causes an edit conflict", async assert => {
   // prettier-ignore
   server.put("/posts/398", () => [ // eslint-disable-line no-undef
     409, { "Content-Type": "application/json" }, { errors: ["edit conflict"] }
@@ -21,6 +21,11 @@ QUnit.skip("Edit a post that causes an edit conflict", async assert => {
     I18n.t("composer.overwrite_edit"),
     "it shows the overwrite button"
   );
+  assert.ok(
+    find("#draft-status .d-icon-user-edit"),
+    "error icon should be there"
+  );
+  await click(".modal .btn-primary");
 });
 
 QUnit.test(