diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index 5750eb21ad51..34b301878989 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -1148,6 +1148,10 @@ public class StringUtil {
     }
 
     if (name.endsWith("ies")) {
+      if (name.endsWith("cookies") || name.endsWith("Cookies")) {
+        return name.substring(0, name.length() - "ookies".length()) + "ookie";
+      }
+
       return name.substring(0, name.length() - 3) + "y";
     }