diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 062688d1277..0876b8b3f85 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -16,6 +16,13 @@
   <div class='reviewable-contents'>
     {{#if editing}}
       <div class='editable-fields'>
+        {{#if reviewable.created_by}}
+          <div class='editable-created-by'>
+            {{avatar reviewable.created_by imageSize="tiny"}}
+            {{reviewable-created-by-name user=reviewable.created_by tagName=''}}
+          </div>
+        {{/if}}
+
         {{#each reviewable.editable_fields as |f|}}
           <div class='editable-field {{dasherize f.id}}'>
             {{component
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 80f278ceeb6..e50c8e50fa3 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -381,6 +381,14 @@
 }
 
 .editable-fields {
+  .editable-created-by {
+    display: flex;
+    .avatar {
+      margin-right: 0.25em;
+    }
+    margin-bottom: 0.5em;
+  }
+
   width: 100%;
   .editable-field {
     .mini-tag-chooser {