diff --git a/Elwig/Windows/PaymentVariantsWindow.xaml.cs b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
index 5699bf3..9691bd6 100644
--- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
@@ -52,6 +52,8 @@ namespace Elwig.Windows {
                 Arrow3.Content = locked ? "\xF0B0" : "\xF0AF";
                 CopyButton.IsEnabled = true;
                 EditButton.Content = locked ? "Ansehen" : "Bearbeiten";
+                EditButton.IsEnabled = true;
+                SaveButton.IsEnabled = !locked;
                 ShowButton.IsEnabled = true;
                 PrintButton.IsEnabled = true;
                 ExportButton.IsEnabled = locked;
@@ -86,6 +88,8 @@ namespace Elwig.Windows {
                 DataInput.IsReadOnly = locked;
             } else {
                 EditButton.Content = "Bearbeiten";
+                EditButton.IsEnabled = false;
+                SaveButton.IsEnabled = false;
                 CopyButton.IsEnabled = false;
                 CalculateButton.IsEnabled = false;
                 CommitButton.IsEnabled = false;
@@ -125,11 +129,11 @@ namespace Elwig.Windows {
         private void UpdateSaveButton() {
             SaveButton.IsEnabled = PaymentVariantList.SelectedItem != null &&
                 ((DataChanged && DataValid) || NameChanged || CommentChanged ||
-                (TransferDateChanged && TransferDateValid)) ||
+                (TransferDateChanged && TransferDateValid) ||
                 (ConsiderModifiersInput.IsChecked != BillingData?.ConsiderDelieryModifiers) ||
                 (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
                 (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
-                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares);
+                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares));
         }
 
         private void UpdateSums() {