diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 08cde41..6c6c892 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -1708,6 +1708,7 @@ Wiki.prototype.delete_all_editors = function ( event ) {
   }
 
   this.zero_total_notes_count();
+  removeElement( "note_tree_root_table" );
   this.display_empty_message( true );
 
   event.stop();
diff --git a/view/Note_tree_area.py b/view/Note_tree_area.py
index c78a1bc..ec58043 100644
--- a/view/Note_tree_area.py
+++ b/view/Note_tree_area.py
@@ -22,7 +22,7 @@ class Note_tree_area( Div ):
             title = note.title,
             link_attributes = u'href="/notebooks/%s?note_id=%s"' % ( notebook.object_id, note.object_id ),
             link_class = u"note_tree_link",
-            has_children = self.LINK_PATTERN.search( note.contents ),
+            has_children = ( notebook.name != u"trash" ) and self.LINK_PATTERN.search( note.contents ) or False,
             root_note_id = note.object_id,
           ) for note in root_notes ],
           tree_id = "note_tree_root_table",