diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
index bc6e0e95bfe..2bc69273004 100644
--- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
@@ -22,20 +22,20 @@ export default Ember.Component.extend({
           return this._formatReplyToTopic(opts.topicLink);
         }
       case EDIT:
-        if (opts.userAvatar && opts.userLink && opts.topicLink) {
+        if (opts.userAvatar && opts.userLink && opts.postLink) {
           return this._formatEditUserPost(
             opts.userAvatar,
             opts.userLink,
-            opts.topicLink,
+            opts.postLink,
             opts.originalUser
           );
         }
     };
   },
 
-  _formatEditUserPost(userAvatar, userLink, topicLink, originalUser) {
+  _formatEditUserPost(userAvatar, userLink, postLink, originalUser) {
     let editTitle = `
-      <a class="topic-link" href="${topicLink.href}">${topicLink.anchor}</a>
+      <a class="post-link" href="${postLink.href}">${postLink.anchor}</a>
       ${userAvatar}
       <span class="username">${userLink.anchor}</span>
       ${iconHTML("mail-forward", { class: "reply-to-glyph" })}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index ead057f8a1f..9c829becd98 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -105,12 +105,12 @@
       align-items: center;
       width: auto;
       max-width: 100%;
-      
+
       .avatar {
         width: 20px;
       }
 
-      .topic-link, .user-link {
+      .topic-link, .user-link, .post-link {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;