diff --git a/I18N Commander/UI WinForms/Components/SectionTree.cs b/I18N Commander/UI WinForms/Components/SectionTree.cs
index 308a38c..f7b3db6 100644
--- a/I18N Commander/UI WinForms/Components/SectionTree.cs	
+++ b/I18N Commander/UI WinForms/Components/SectionTree.cs	
@@ -151,6 +151,9 @@ public partial class SectionTree : UserControl
         // Ensure, that the added node is visible and gets the focus:
         node.EnsureVisible();
         this.treeView.SelectedNode = node;
+        
+        // Fire the click event:
+        this.treeView_NodeMouseClick(this, new TreeNodeMouseClickEventArgs(node, MouseButtons.Left, 1, 0, 0));
     }
 
     private async void buttonRemove_Click(object sender, EventArgs e)
@@ -178,6 +181,12 @@ public partial class SectionTree : UserControl
         
         // Reload the tree:
         this.LoadNodes(this, EventArgs.Empty);
+        
+        // Select the first root node:
+        this.treeView.SelectedNode = this.treeView.Nodes.Count > 0 ? this.treeView.Nodes[0] : null;
+        
+        // Fire the click event:
+        this.treeView_NodeMouseClick(this, new TreeNodeMouseClickEventArgs(this.treeView.SelectedNode!, MouseButtons.Left, 1, 0, 0));
     }
 
     private async void treeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)