diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift
index c58ed8523..f523a627a 100644
--- a/Frameworks/Account/Account.swift
+++ b/Frameworks/Account/Account.swift
@@ -253,6 +253,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 			didAddFeed = true
 		}
 		
+		rebuildFeedDictionaries()
 		return didAddFeed // TODO
 	}
 
@@ -290,6 +291,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		}
 		children += [folder]
 		postChildrenDidChangeNotification()
+		rebuildFeedDictionaries()
 		return true
 	}
 
@@ -396,7 +398,8 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 	}
     
     @objc func batchUpdateDidPerform(_ note: Notification) {
-        
+
+		rebuildFeedDictionaries()
         updateUnreadCount()
     }