diff --git a/OpenNest.Core/PlateManager.cs b/OpenNest.Core/PlateManager.cs
index 47617e0..8708bc6 100644
--- a/OpenNest.Core/PlateManager.cs
+++ b/OpenNest.Core/PlateManager.cs
@@ -199,6 +199,12 @@ namespace OpenNest
         private void OnPlateAdded(object sender, ItemAddedEventArgs<Plate> e)
         {
             PlateListChanged?.Invoke(this, EventArgs.Empty);
+
+            if (!suppressNavigation)
+            {
+                CurrentIndex = Count - 1;
+                FireCurrentPlateChanged();
+            }
         }
 
         private void OnPlateRemoved(object sender, ItemRemovedEventArgs<Plate> e)
diff --git a/OpenNest.Tests/PlateManagerTests.cs b/OpenNest.Tests/PlateManagerTests.cs
index 4e7a494..9810528 100644
--- a/OpenNest.Tests/PlateManagerTests.cs
+++ b/OpenNest.Tests/PlateManagerTests.cs
@@ -390,6 +390,8 @@ public class PlateManagerTests
         Assert.False(mgr.CanRemoveCurrent);
 
         nest.CreatePlate();
+        // Auto-navigated to plate2 (empty), go back to plate1 (has parts)
+        mgr.LoadFirst();
         Assert.True(mgr.CanRemoveCurrent);
     }
 }