diff --git a/templates/partials/topic/post-editor.tpl b/templates/partials/topic/post-editor.tpl
new file mode 100644
index 0000000..d0c996b
--- /dev/null
+++ b/templates/partials/topic/post-editor.tpl
@@ -0,0 +1 @@
+<small component="post/editor" class="pull-right <!-- IF !editor.username -->hidden<!-- ENDIF !editor.username -->">[[global:last_edited_by_ago, <strong><a href="{relative_path}/user/{editor.userslug}">{editor.username}</a></strong>, <span class="timeago" title="{relativeEditTime}"></span>]]</small>
\ No newline at end of file
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 02bc436..ab67e29 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -48,8 +48,8 @@
 	{posts.content}
 </div>
 
-<!-- IF posts.editor.username -->
-<small class="pull-right">[[global:last_edited_by_ago, <strong><a href="{relative_path}/user/{posts.editor.userslug}">{posts.editor.username}</a></strong>, <span class="timeago" title="{posts.relativeEditTime}"></span>]]</small>
-<!-- ENDIF posts.editor.username -->
+
+<small component="post/editor" class="pull-right <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->">[[global:last_edited_by_ago, <strong><a href="{relative_path}/user/{posts.editor.userslug}">{posts.editor.username}</a></strong>, <span class="timeago" title="{posts.relativeEditTime}"></span>]]</small>
+
 
 <hr />
\ No newline at end of file