diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index c7bb3eb..edbb90f 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -690,7 +690,7 @@ namespace Elwig.Windows {
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            NewDeliveryPartButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
             var p = await ViewModel.UpdateDeliveryPart(
                 (DeliveryList.SelectedItem as Delivery)?.Year,
@@ -703,9 +703,10 @@ namespace Elwig.Windows {
             EmptyScale();
             await RefreshList();
             await RefreshDeliveryParts();
-            NewDeliveryPartButton.Cursor = null;
+            Mouse.OverrideCursor = null;
             ControlUtils.SelectItem(DeliveryList, p?.Delivery);
             DeliveryPartList.SelectedItem = null;
+            DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last());
             RefreshInputs();
             InitialInputs();
         }
@@ -713,7 +714,7 @@ namespace Elwig.Windows {
         private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            FinishButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
             var p = await ViewModel.UpdateDeliveryPart(
                 (DeliveryList.SelectedItem as Delivery)?.Year,
@@ -727,7 +728,6 @@ namespace Elwig.Windows {
             await RefreshList();
             await RefreshDeliveryParts();
             if (p?.Delivery != null) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     using var ctx = new AppDbContext();
                     using var doc = new DeliveryNote((await ctx.Deliveries.FindAsync(p.Year, p.DId))!, ctx);
@@ -740,9 +740,8 @@ namespace Elwig.Windows {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-                Mouse.OverrideCursor = null;
             }
-            FinishButton.Cursor = null;
+            Mouse.OverrideCursor = null;
             DeliveryList.SelectedItem = null;
             await RenewContext();
             RefreshInputs();
@@ -937,7 +936,7 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            SaveButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
 
             IsEditing = false;
             IsCreating = false;
@@ -953,7 +952,7 @@ namespace Elwig.Windows {
                 !InputIsNotDefault(TimeInput)
             );
 
-            SaveButton.Cursor = null;
+            Mouse.OverrideCursor = null;
 
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();