diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
index 5c85e34..cb577f0 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
@@ -82,6 +82,7 @@
 
       <StackPanel>
         <TreeView
+          x:Name="TreeViewWorkspace"
           ItemsSource="{Binding CurrentTreeNodes}"
           SelectedItem="{Binding SelectedTreeNode}">
 
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
index 0dc5d7f..1217fce 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
@@ -205,7 +205,10 @@ public partial class MainWindow : Window, IMainApi
             Version = new(),
         };
         Model.CurrentWorkspace.UpdateInfos.Updates.Insert(0, update);
-        nodeUpdates.Nodes.Insert(0, new ActionSetTreeNode(update));
+        var item = new ActionSetTreeNode(update);
+        nodeUpdates.Nodes.Insert(0, item);
+        TreeViewWorkspace.SelectedItem = item;
+        TreeViewWorkspace.ScrollIntoView(item);
     }
 
     private void MenuItemRemoveUpdate_OnClick(object? sender, RoutedEventArgs e)
@@ -240,8 +243,11 @@ public partial class MainWindow : Window, IMainApi
             default:
                 return;
         }
-        
-        rows.List.Add(new MainWindowGridRow(action, rootInfos));
+
+        var row = new MainWindowGridRow(action, rootInfos);
+        rows.List.Add(row);
+        DataGridActions.SelectedItem = row;
+        DataGridActions.ScrollIntoView(row, null);
     }
 
     private void ButtonRemoveAction_OnClick(object? sender, RoutedEventArgs e)