diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
index a8232047..698dc7ad 100644
--- a/src/ViewModels/BranchTreeNode.cs
+++ b/src/ViewModels/BranchTreeNode.cs
@@ -58,6 +58,7 @@ namespace SourceGit.ViewModels
         {
             public List<BranchTreeNode> Locals => _locals;
             public List<BranchTreeNode> Remotes => _remotes;
+            public List<string> InvalidExpandedNodes => _invalidExpandedNodes;
 
             public void SetExpandedNodes(List<string> expanded)
             {
@@ -98,6 +99,12 @@ namespace SourceGit.ViewModels
                     }
                 }
 
+                foreach (var path in _expanded)
+                {
+                    if (!folders.ContainsKey(path))
+                        _invalidExpandedNodes.Add(path);
+                }
+
                 folders.Clear();
                 SortNodes(_locals);
                 SortNodes(_remotes);
@@ -188,6 +195,7 @@ namespace SourceGit.ViewModels
 
             private readonly List<BranchTreeNode> _locals = new List<BranchTreeNode>();
             private readonly List<BranchTreeNode> _remotes = new List<BranchTreeNode>();
+            private readonly List<string> _invalidExpandedNodes = new List<string>();
             private readonly HashSet<string> _expanded = new HashSet<string>();
         }
     }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 993597a5..82197bdf 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -2088,6 +2088,9 @@ namespace SourceGit.ViewModels
             {
                 builder.SetExpandedNodes(_settings.ExpandedBranchNodesInSideBar);
                 builder.Run(branches, remotes, false);
+
+                foreach (var invalid in builder.InvalidExpandedNodes)
+                    _settings.ExpandedBranchNodesInSideBar.Remove(invalid);
             }
             else
             {