diff --git a/Elwig/Windows/PaymentVariantsWindow.xaml.cs b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
index fc12b35..d2d1955 100644
--- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
@@ -55,6 +55,9 @@ namespace Elwig.Windows {
                 .OrderBy(v => v.AvNr)
                 .Include(v => v.Season.Currency)
                 .ToListAsync());
+            if (PaymentVariantList.SelectedItem == null && PaymentVariantList.Items.Count > 0) {
+                PaymentVariantList.SelectedIndex = PaymentVariantList.Items.Count - 1;
+            }
             Update();
         }
 
@@ -119,6 +122,11 @@ namespace Elwig.Windows {
         private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant)
                 return;
+            var res = MessageBox.Show(
+                $"Soll die Auszahlungsvariante \"{v.Name}\" wirklich unwiderruflich gelöscht werden?",
+                "Auszahlungsvariante löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (res != MessageBoxResult.OK)
+                return;
             Mouse.OverrideCursor = Cursors.Wait;
             try {
                 await PaymentVariantService.DeletePaymentVariant(v.Year, v.AvNr);