diff --git a/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift b/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift
index af22e3d24..7ed314adf 100644
--- a/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift
+++ b/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift
@@ -107,7 +107,12 @@ private extension SidebarTreeControllerDelegate {
 
 	func sortedAccountNodes(_ parent: Node) -> [Node] {
 
-		let nodes = AccountManager.shared.accounts.map { createNode(account: $0, parent: parent) }
+		let nodes = AccountManager.shared.accounts.map { (account) -> Node in
+			let accountNode = parent.existingOrNewChildNode(with: account)
+			accountNode.canHaveChildNodes = true
+			accountNode.isGroupItem = true
+			return accountNode
+		}
 		return nodes.sortedAlphabetically()
 	}