diff --git a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
index b0c1ec443a6b..2ef7ad983bc8 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
@@ -185,7 +185,7 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase {
           public void run() {
             try {
               PsiFile firstFile = null;
-              final int[] choice = elements.length > 1 ? new int[]{-1} : null;
+              final int[] choice = elements.length > 1 || elements[0] instanceof PsiDirectory ? new int[]{-1} : null;
               for (PsiElement element : elements) {
                 PsiFile f = copyToDirectory((PsiFileSystemItem)element, newName, targetDirectory, choice);
                 if (firstFile == null) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java
index 87711a25bdc9..e7a2727fd943 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java
@@ -137,7 +137,7 @@ public class MoveFilesOrDirectoriesUtil {
 
             PsiManager manager = PsiManager.getInstance(project);
             try {
-              final int[] choice = elements.length > 1 ? new int[]{-1} : null;
+              final int[] choice = elements.length > 1 || elements[0] instanceof PsiDirectory ? new int[]{-1} : null;
               final List<PsiElement> els = new ArrayList<PsiElement>();
               for (int i = 0, newElementsLength = newElements.length; i < newElementsLength; i++) {
                 final PsiElement psiElement = newElements[i];