diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageHandler.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageHandler.java
index bd6318e7ba31..f5c99d5b9f09 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageHandler.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageHandler.java
@@ -159,10 +159,15 @@ public class CreateDirectoryOrPackageHandler implements InputValidatorEx {
       FileType fileType = findFileTypeBoundToName(subDirName);
       if (fileType != null) {
         String message = "The name you entered looks like a file name. Do you want to create a file named " + subDirName + " instead?";
-        int ec = Messages.showYesNoDialog(myProject, message,
-                                           "File Name Detected", "Yes, create file",
-                                           "No, create " + (myIsDirectory ? "directory" : "packages"),
-                                           fileType.getIcon());
+        int ec = Messages.showYesNoCancelDialog(myProject, message,
+                                                "File Name Detected", 
+                                                "&Yes, create file",
+                                                "&No, create " + (myIsDirectory ? "directory" : "packages"),
+                                                "&Cancel",
+                                                fileType.getIcon());
+        if (ec == Messages.CANCEL) {
+          return false;
+        }
         if (ec == Messages.YES) {
           createFile = true;
         }