diff --git a/DbFirst.BlazorWasm/Components/CatalogsGrid.razor b/DbFirst.BlazorWasm/Components/CatalogsGrid.razor
index 42973ee..8aa8603 100644
--- a/DbFirst.BlazorWasm/Components/CatalogsGrid.razor
+++ b/DbFirst.BlazorWasm/Components/CatalogsGrid.razor
@@ -78,6 +78,7 @@ else
                 CssClass="mb-4 catalog-grid"
                 EditMode="GridEditMode.PopupEditForm"
                 PopupEditFormCssClass="catalog-edit-popup"
+                PopupEditFormHeaderText="@popupHeaderText"
                 CustomizeEditModel="OnCustomizeEditModel"
                 EditModelSaving="OnEditModelSaving"
                 DataItemDeleting="OnDataItemDeleting">
@@ -114,7 +115,7 @@ else
                 <DxGridDataColumn FieldName="@nameof(CatalogReadDto.AddedWhen)" Caption="Angelegt am" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>
@@ -128,13 +129,13 @@ else
                 <DxGridDataColumn FieldName="@nameof(CatalogReadDto.ChangedWhen)" Caption="Geändert am" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>
             </Columns>
             <EditFormTemplate Context="editFormContext">
-                @{ SetEditContext(editFormContext.EditContext); var editModel = (CatalogEditModel)editFormContext.EditModel; }
+                @{ SetEditContext(editFormContext.EditContext); var editModel = (CatalogEditModel)editFormContext.EditModel; SetPopupHeaderText(editModel.IsNew); }
                 <DxFormLayout ColCount="2">
                     <DxFormLayoutItem Caption="Titel">
                         <DxTextBox @bind-Text="editModel.CatTitle"
@@ -145,15 +146,18 @@ else
                     <DxFormLayoutItem Caption="Kennung">
                         <DxTextBox @bind-Text="editModel.CatString" Width="100%" />
                     </DxFormLayoutItem>
-                    <DxFormLayoutItem Caption="Update-Prozedur">
-                        <DxComboBox Data="@procedureOptions"
-                                    TData="ProcedureOption"
-                                    TValue="int"
-                                    TextFieldName="Text"
-                                    ValueFieldName="Value"
-                                    @bind-Value="editModel.UpdateProcedure"
-                                    Width="100%" />
-                    </DxFormLayoutItem>
+                    @if (!editModel.IsNew)
+                    {
+                        <DxFormLayoutItem Caption="Update-Prozedur">
+                            <DxComboBox Data="@procedureOptions"
+                                        TData="ProcedureOption"
+                                        TValue="int"
+                                        TextFieldName="Text"
+                                        ValueFieldName="Value"
+                                        @bind-Value="editModel.UpdateProcedure"
+                                        Width="100%" />
+                        </DxFormLayoutItem>
+                    }
                     <DxFormLayoutItem ColSpanMd="12">
                         <ValidationSummary />
                     </DxFormLayoutItem>
@@ -170,6 +174,7 @@ else
     private string? infoMessage;
     private EditContext? editContext;
     private ValidationMessageStore? validationMessageStore;
+    private string popupHeaderText = "Edit";
 
     private readonly List<ProcedureOption> procedureOptions = new()
     {
@@ -227,9 +232,10 @@ else
 
     private void OnCustomizeEditModel(GridCustomizeEditModelEventArgs e)
     {
+        popupHeaderText = e.IsNew ? "Neu" : "Edit";
         if (e.IsNew)
         {
-            e.EditModel = new CatalogEditModel();
+            e.EditModel = new CatalogEditModel { IsNew = true };
             return;
         }
 
@@ -240,7 +246,8 @@ else
             CatTitle = item.CatTitle,
             CatString = item.CatString,
             UpdateProcedure = 0,
-            OriginalCatTitle = item.CatTitle
+            OriginalCatTitle = item.CatTitle,
+            IsNew = false
         };
     }
 
@@ -385,6 +392,11 @@ else
         }
     }
 
+    private void SetPopupHeaderText(bool isNew)
+    {
+        popupHeaderText = isNew ? "Neu" : "Edit";
+    }
+
     private sealed class CatalogEditModel
     {
         public int Guid { get; set; }
@@ -392,6 +404,7 @@ else
         public string CatString { get; set; } = string.Empty;
         public int UpdateProcedure { get; set; }
         public string OriginalCatTitle { get; set; } = string.Empty;
+        public bool IsNew { get; set; }
     }
 
     private sealed class ProcedureOption
diff --git a/DbFirst.BlazorWasm/Components/MassDataGrid.razor b/DbFirst.BlazorWasm/Components/MassDataGrid.razor
index a0fba53..70b3e0d 100644
--- a/DbFirst.BlazorWasm/Components/MassDataGrid.razor
+++ b/DbFirst.BlazorWasm/Components/MassDataGrid.razor
@@ -82,6 +82,7 @@ else
                 PageSize="100"
                 CssClass="mb-3 massdata-grid"
                 EditMode="GridEditMode.PopupEditForm"
+                PopupEditFormHeaderText="Bearbeiten"
                 EditModelSaving="OnEditModelSaving"
                 DataItemDeleting="OnDataItemDeleting">
             <Columns>
@@ -129,14 +130,14 @@ else
                 <DxGridDataColumn FieldName="@nameof(MassDataReadDto.AddedWhen)" Caption="Added" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>
                 <DxGridDataColumn FieldName="@nameof(MassDataReadDto.ChangedWhen)" Caption="Changed" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>
diff --git a/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor b/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor
index 322c3b5..9bb0fba 100644
--- a/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor
+++ b/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor
@@ -37,6 +37,7 @@ else
                 CssClass="mb-4 catalog-grid"
                 EditMode="GridEditMode.PopupEditForm"
                 PopupEditFormCssClass="catalog-edit-popup"
+                PopupEditFormHeaderText="@popupHeaderText"
                 CustomizeEditModel="OnCustomizeEditModel"
                 EditModelSaving="OnEditModelSaving"
                 DataItemDeleting="OnDataItemDeleting">
@@ -73,7 +74,7 @@ else
                 <DxGridDataColumn FieldName="@nameof(CatalogReadDto.AddedWhen)" Caption="Angelegt am" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>
@@ -87,13 +88,13 @@ else
                 <DxGridDataColumn FieldName="@nameof(CatalogReadDto.ChangedWhen)" Caption="Geändert am" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>
             </Columns>
             <EditFormTemplate Context="editFormContext">
-                @{ SetEditContext(editFormContext.EditContext); var editModel = (CatalogEditModel)editFormContext.EditModel; }
+                @{ SetEditContext(editFormContext.EditContext); var editModel = (CatalogEditModel)editFormContext.EditModel; SetPopupHeaderText(editModel.IsNew); }
                 <DxFormLayout ColCount="2">
                     <DxFormLayoutItem Caption="Titel">
                         <DxTextBox @bind-Text="editModel.CatTitle"
@@ -104,15 +105,18 @@ else
                     <DxFormLayoutItem Caption="Kennung">
                         <DxTextBox @bind-Text="editModel.CatString" Width="100%" />
                     </DxFormLayoutItem>
-                    <DxFormLayoutItem Caption="Update-Prozedur">
-                        <DxComboBox Data="@procedureOptions"
-                                    TData="ProcedureOption"
-                                    TValue="int"
-                                    TextFieldName="Text"
-                                    ValueFieldName="Value"
-                                    @bind-Value="editModel.UpdateProcedure"
-                                    Width="100%" />
-                    </DxFormLayoutItem>
+                    @if (!editModel.IsNew)
+                    {
+                        <DxFormLayoutItem Caption="Update-Prozedur">
+                            <DxComboBox Data="@procedureOptions"
+                                        TData="ProcedureOption"
+                                        TValue="int"
+                                        TextFieldName="Text"
+                                        ValueFieldName="Value"
+                                        @bind-Value="editModel.UpdateProcedure"
+                                        Width="100%" />
+                        </DxFormLayoutItem>
+                    }
                     <DxFormLayoutItem ColSpanMd="12">
                         <ValidationSummary />
                     </DxFormLayoutItem>
@@ -129,6 +133,7 @@ else
     private string? infoMessage;
     private EditContext? editContext;
     private ValidationMessageStore? validationMessageStore;
+    private string popupHeaderText = "Edit";
 
     private readonly List<ProcedureOption> procedureOptions = new()
     {
@@ -184,11 +189,17 @@ else
         editContext.NotifyValidationStateChanged();
     }
 
+    private void SetPopupHeaderText(bool isNew)
+    {
+        popupHeaderText = isNew ? "Neu" : "Edit";
+    }
+
     private void OnCustomizeEditModel(GridCustomizeEditModelEventArgs e)
     {
+        popupHeaderText = e.IsNew ? "Neu" : "Edit";
         if (e.IsNew)
         {
-            e.EditModel = new CatalogEditModel();
+            e.EditModel = new CatalogEditModel { IsNew = true };
             return;
         }
 
@@ -199,7 +210,8 @@ else
             CatTitle = item.CatTitle,
             CatString = item.CatString,
             UpdateProcedure = 0,
-            OriginalCatTitle = item.CatTitle
+            OriginalCatTitle = item.CatTitle,
+            IsNew = false
         };
     }
 
@@ -351,6 +363,7 @@ else
         public string CatString { get; set; } = string.Empty;
         public int UpdateProcedure { get; set; }
         public string OriginalCatTitle { get; set; } = string.Empty;
+        public bool IsNew { get; set; }
     }
 
     private sealed class ProcedureOption
diff --git a/DbFirst.BlazorWebApp/Components/MassDataGrid.razor b/DbFirst.BlazorWebApp/Components/MassDataGrid.razor
index a0fba53..70b3e0d 100644
--- a/DbFirst.BlazorWebApp/Components/MassDataGrid.razor
+++ b/DbFirst.BlazorWebApp/Components/MassDataGrid.razor
@@ -82,6 +82,7 @@ else
                 PageSize="100"
                 CssClass="mb-3 massdata-grid"
                 EditMode="GridEditMode.PopupEditForm"
+                PopupEditFormHeaderText="Bearbeiten"
                 EditModelSaving="OnEditModelSaving"
                 DataItemDeleting="OnDataItemDeleting">
             <Columns>
@@ -129,14 +130,14 @@ else
                 <DxGridDataColumn FieldName="@nameof(MassDataReadDto.AddedWhen)" Caption="Added" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>
                 <DxGridDataColumn FieldName="@nameof(MassDataReadDto.ChangedWhen)" Caption="Changed" ReadOnly="true">
                     <FilterRowCellTemplate Context="filter">
                         <DxDateEdit Date="@((DateTime?)filter.FilterRowValue)"
-                                    DateChanged="@((DateTime? value) => filter.FilterRowValue = value)"
+                                    DateChanged="@((DateTime? value) => { filter.FilterRowValue = value; })"
                                     Width="100%" />
                     </FilterRowCellTemplate>
                 </DxGridDataColumn>