diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
index e1ec134f..02f5aeff 100644
--- a/src/ViewModels/BranchTreeNode.cs
+++ b/src/ViewModels/BranchTreeNode.cs
@@ -152,6 +152,8 @@ namespace SourceGit.ViewModels
                     if (folders.TryGetValue(folder, out var val))
                     {
                         lastFolder = val;
+                        if (!lastFolder.IsExpanded)
+                            lastFolder.IsExpanded |= (branch.IsCurrent || _expanded.Contains(folder));
                     }
                     else if (lastFolder == null)
                     {