diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
index cb6c1f4..26370b1 100644
--- a/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -1070,23 +1070,27 @@ public partial class MainWindow : Window
 
     private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
     {
+        var id = (LstCustomerAdressSets.SelectedItems[0] as KasAddressList).ID;
+        var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
+        var curr_set = new KasAddressList("");
+        foreach (var set in Settings._instance.addressSets.addresses)
+            if (set.ID == id)
+            {
+                curr_set = set;
+
+            }
+        
+        
         if (LstCustomerAdressSets.SelectedItems.Count > 0)
             try
             {
-                var result = await NamingWindow.Show(this);
+                var result = await NamingWindow.Show(this, curr_set.Name);
                 if (result != null)
                 {
-                    var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
-                        .ToString());
-                    var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
-                    foreach (var set in Settings._instance.addressSets.addresses)
-                        if (set.ID == id)
-                        {
-                            set.Name = result;
-                            Settings.Save();
-                            RefreshAddressSetListItems(cus_id);
-                            break;
-                        }
+                    curr_set.Name = result;
+                    Settings.Save();
+                    RefreshAddressSetListItems(cus_id);
+                    return;
                 }
             }
             catch (Exception ex)