diff --git a/ember/app/components/discussion/post-header/edited.js b/ember/app/components/discussion/post-header/edited.js
index e28f1b147..c81731a60 100644
--- a/ember/app/components/discussion/post-header/edited.js
+++ b/ember/app/components/discussion/post-header/edited.js
@@ -9,8 +9,9 @@ var precompileTemplate = Ember.Handlebars.compile;
   hover which details who edited the post and when.
  */
 export default Ember.Component.extend({
-  tagName: 'span',
+  tagName: 'li',
   classNames: ['post-edited'],
+  classNameBindings: ['hidden'],
   attributeBindings: ['title'],
   layout: precompileTemplate('{{fa-icon "pencil"}}'),
 
@@ -20,7 +21,7 @@ export default Ember.Component.extend({
 
   // In the context of an item list, this item will be hidden if the post
   // hasn't been edited, or if it's been hidden.
-  hideItem: Ember.computed('post.isEdited', 'post.isHidden', function() {
+  hidden: Ember.computed('post.isEdited', 'post.isHidden', function() {
     return !this.get('post.isEdited') || this.get('post.isHidden');
   }),
 
diff --git a/ember/app/components/discussion/post-header/toggle.js b/ember/app/components/discussion/post-header/toggle.js
index cdef15650..714bdcd3c 100644
--- a/ember/app/components/discussion/post-header/toggle.js
+++ b/ember/app/components/discussion/post-header/toggle.js
@@ -9,9 +9,10 @@ var precompileTemplate = Ember.Handlebars.compile;
  */
 export default Ember.Component.extend({
   tagName: 'li',
+  classNameBindings: ['hidden'],
   layout: precompileTemplate('<a href="#" class="btn btn-default btn-more" {{action "toggle"}}>{{fa-icon "ellipsis-h"}}</a>'),
 
-  hideItem: Ember.computed.not('post.isHidden'),
+  hidden: Ember.computed.not('post.isHidden'),
 
   actions: {
     toggle: function() {
diff --git a/ember/app/templates/components/ui/item-list.hbs b/ember/app/templates/components/ui/item-list.hbs
index 41542f982..d3e616153 100644
--- a/ember/app/templates/components/ui/item-list.hbs
+++ b/ember/app/templates/components/ui/item-list.hbs
@@ -1,9 +1,7 @@
 {{#each item in listItems}}
-  {{#unless item.hideItem}}
-    {{#if item.isListItem}}
-      {{view item}}
-    {{else}}
-      <li>{{view item}}</li>
-    {{/if}}
-  {{/unless}}
+  {{#if item.isListItem}}
+    {{view item}}
+  {{else}}
+    <li>{{view item}}</li>
+  {{/if}}
 {{/each}}