diff --git a/src/.idea/.idea.NopCommerce/.idea/indexLayout.xml b/src/.idea/.idea.NopCommerce/.idea/indexLayout.xml
new file mode 100644
index 00000000000..7b08163cebc
--- /dev/null
+++ b/src/.idea/.idea.NopCommerce/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/.idea/.idea.NopCommerce/.idea/material_theme_project_new.xml b/src/.idea/.idea.NopCommerce/.idea/material_theme_project_new.xml
new file mode 100644
index 00000000000..09b9ee06266
--- /dev/null
+++ b/src/.idea/.idea.NopCommerce/.idea/material_theme_project_new.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="-11de74ec:196e821678b:-7ffd" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/.idea/.idea.NopCommerce/.idea/workspace.xml b/src/.idea/.idea.NopCommerce/.idea/workspace.xml
new file mode 100644
index 00000000000..80d92975bfa
--- /dev/null
+++ b/src/.idea/.idea.NopCommerce/.idea/workspace.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoGeneratedRunConfigurationManager">
+    <projectFile>Presentation/Nop.Web/Nop.Web.csproj</projectFile>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="6adfa481-e6b8-4fa6-a794-4b11f7cf44b1" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "node.js.selected.package.tslint": "(autodetect)"
+  }
+}]]></component>
+  <component name="TaskManager">
+    <servers />
+  </component>
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+</project>
\ No newline at end of file
diff --git a/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml b/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
index cbdfae49cfa..c247fa4b238 100644
--- a/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
+++ b/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
@@ -2507,7 +2507,7 @@
   </LocaleResource>
   <LocaleResource Name="Admin.Catalog.FilterLevelValues.Updated">
     <Value>The filter level value has been updated successfully.</Value>
-  </LocaleResource>  
+  </LocaleResource>
   <LocaleResource Name="Admin.Catalog.Manufacturers">
     <Value>Manufacturers</Value>
   </LocaleResource>
@@ -8559,7 +8559,7 @@
   </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Settings.Order.AllowCustomersCancelOrders.Hint">
     <Value>Check to allow customers to cancel orders</Value>
-  </LocaleResource>    
+  </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Settings.Order.AnonymousCheckoutAllowed">
     <Value>Anonymous checkout allowed</Value>
   </LocaleResource>
@@ -21416,6 +21416,9 @@
   <LocaleResource Name="Wishlist.SelectWishlist">
     <Value>Specify your wishlist</Value>
   </LocaleResource>
+  <LocaleResource Name="Wishlist.DuplicateNameNotAllowed">
+    <Value>A wishlist with this name already exists.</Value>
+  </LocaleResource>
   <LocaleResource Name="Wishlist.TaxShipping.ExclTax">
     <Value><![CDATA[All prices are entered excluding tax. Excluding <a href="{0}">shipping</a>]]></Value>
   </LocaleResource>
@@ -21431,4 +21434,4 @@
   <LocaleResource Name="Wishlist.YourWishlistURL">
     <Value>Your wishlist URL for sharing</Value>
   </LocaleResource>
-</Language>
+</Language>
\ No newline at end of file
diff --git a/src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs b/src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs
index bdd1bab2ba4..173cc3142ad 100644
--- a/src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs
+++ b/src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs
@@ -1774,8 +1774,21 @@ public virtual async Task<IActionResult> AddWishlist(string name, int productId)
             });
         }
 
-        // Check if customer has reached the maximum number of custom wishlists allowed
         var currentWishlists = await _customWishlistService.GetAllCustomWishlistsAsync(customer.Id);
+        // Check if customer has already have wishlist of same name
+        var existingWishlist = currentWishlists
+            .FirstOrDefault(x => x.Name.Equals(name.Trim(), StringComparison.OrdinalIgnoreCase));
+
+        if (existingWishlist != null)
+        {
+            return Json(new
+            {
+                success = false,
+                message = await _localizationService.GetResourceAsync("Wishlist.DuplicateNameNotAllowed")
+            });
+        }
+
+        // Check if customer has reached the maximum number of custom wishlists allowed
         var maximumNumberOfCustomWishlist = _shoppingCartSettings.MaximumNumberOfCustomWishlist;
         if (currentWishlists.Count >= maximumNumberOfCustomWishlist)
         {