I thought this works

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -62,7 +62,7 @@ public override void InitializeView(IView parent)
         public override void OnEnable()
         {
             base.OnEnable();
-            UpdateTreeIcons();
+            TreeOnEnable();
             AttachHandlers(Repository);
             Repository.CheckLocalAndRemoteBranchListChangedEvent(lastLocalAndRemoteBranchListChangedEvent);
         }
@@ -164,7 +164,7 @@ private void BuildTree()
                 treeRemotes.Title = RemoteTitle;
                 treeRemotes.IsRemote = true;
 
-                UpdateTreeIcons();
+                TreeOnEnable();
             }
 
             localBranches.Sort(CompareBranches);
@@ -175,15 +175,17 @@ private void BuildTree()
             Redraw();
         }
 
-        private void UpdateTreeIcons()
+        private void TreeOnEnable()
         {
             if (treeLocals != null)
             {
+                treeLocals.OnEnable();
                 treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
             }
 
             if (treeRemotes != null)
             {
+                treeRemotes.OnEnable();
                 treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
             }
         }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -35,7 +35,7 @@ class ChangesView : Subview
         public override void OnEnable()
         {
             base.OnEnable();
-            UpdateTreeIcons();
+            TreeOnEnable();
             AttachHandlers(Repository);
             Repository.CheckCurrentBranchChangedEvent(lastCurrentBranchChangedEvent);
             Repository.CheckStatusEntriesChangedEvent(lastStatusEntriesChangedEvent);
@@ -200,17 +200,18 @@ private void BuildTree()
                 treeChanges.IsCheckable = true;
                 treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
 
-                UpdateTreeIcons();
+                TreeOnEnable();
             }
 
             treeChanges.Load(gitStatusEntries.Select(entry => new GitStatusEntryTreeData(entry)));
             Redraw();
         }
 
-        private void UpdateTreeIcons()
+        private void TreeOnEnable()
         {
             if (treeChanges != null)
             {
+                treeChanges.OnEnable();
                 treeChanges.UpdateIcons(Styles.FolderIcon);
             }
         }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

@@ -41,7 +41,7 @@ public abstract class Tree<TNode, TData>: TreeBase<TNode, TData>
         [NonSerialized] private TNode rightClickNextRenderNode;
         [NonSerialized] private int controlId;
 
-        [SerializeField] private TreeSelection selectionObject = ScriptableObject.CreateInstance<TreeSelection>();
+        [NonSerialized] private TreeSelection selectionObject;
 
         public bool IsInitialized { get { return Nodes != null && Nodes.Count > 0 && !String.IsNullOrEmpty(Nodes[0].Path); } }
         public bool RequiresRepaint { get; private set; }
@@ -52,12 +52,16 @@ public override TNode SelectedNode
             {
                 if (selectedNode != null && String.IsNullOrEmpty(selectedNode.Path))
                     selectedNode = null;
+
                 return selectedNode;
             }
             set
             {
                 selectedNode = value;
-                Selection.activeObject = selectionObject;
+                if (value != null && selectionObject)
+                {
+                    Selection.activeObject = selectionObject;
+                }
             }
         }
 
@@ -133,7 +137,7 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
                 var titleDisplay = !(rect.y > endDisplay || rect.yMax < startDisplay);
                 if (titleDisplay)
                 {
-                    var isSelected = selectedNode == titleNode;
+                    var isSelected = selectedNode == titleNode && treeHasFocus;
                     renderResult = titleNode.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);
                 }
 
@@ -167,7 +171,8 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
                 var display = !(rect.y > endDisplay || rect.yMax < startDisplay);
                 if (display)
                 {
-                    renderResult = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, treeNodeStyle, activeTreeNodeStyle);
+                    var isSelected = selectedNode == node && treeHasFocus;
+                    renderResult = node.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);
                 }
 
                 if (renderResult == TreeNodeRenderResult.VisibilityChange)
@@ -374,6 +379,14 @@ protected void LoadNodeIcons()
                 SetNodeIcon(treeNode);
             }
         }
+
+        public void OnEnable()
+        {
+            if (!selectionObject)
+            {
+                selectionObject = ScriptableObject.CreateInstance<TreeSelection>();
+            }
+        }
     }
 
     [Serializable]