             header.delegate = self
         }
 
-        if let parentFolder = parentFolder {
-            if parentFolder.guid == BookmarkRoots.RootGUID {
+        if let parentFolder = parentFolders.last {
+            if parentFolders.count == 1 {
                 header.textLabel?.text = NSLocalizedString("Bookmarks", comment: "Panel accessibility label")
             } else {
                 header.textLabel?.text = parentFolder.title


    override func tableView(tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
        // Don't show a header for the root. If there's no root (i.e. source == nil), we'll also show no header.
        if source == nil || source?.current.guid == BookmarkRoots.RootGUID {
            return 0
        }


                break

            case let folder as BookmarkFolder:
                parentFolders.append(source.current)
                // Descend into the folder.
                source.selectFolder(folder).upon(onModelFetched)
                break

            default:
