diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java
index 943ef8a042fa..95f450575d7a 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java
@@ -197,6 +197,15 @@ public class JavaMoveClassesOrPackagesHandler extends MoveHandlerDelegate {
                                             PsiPackage aPackage,
                                             boolean searchInComments,
                                             boolean searchForTextOccurences) {
+            try {
+              for (PsiDirectory dir: directories) {
+                MoveFilesOrDirectoriesUtil.checkIfMoveIntoSelf(dir, targetDirectory);
+              }
+            }
+            catch (IncorrectOperationException e) {
+              Messages.showErrorDialog(project, e.getMessage(), RefactoringBundle.message("cannot.move"));
+              return;
+            }
             final MoveDirectoryWithClassesProcessor processor =
               new MoveDirectoryWithClassesProcessor(project, directories, targetDirectory, searchInComments, searchForTextOccurences,
                                                     true, callback);
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
index bae2a5c929c5..2cfd42d1a3d0 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
@@ -38,7 +38,6 @@ import com.intellij.refactoring.MoveDestination;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.move.MoveCallback;
 import com.intellij.refactoring.move.MoveHandler;
-import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesUtil;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.usageView.UsageViewUtil;
 import com.intellij.util.IncorrectOperationException;
@@ -170,14 +169,6 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends DialogWrapper {
       return;
     }
 
-    try {
-      MoveFilesOrDirectoriesUtil.checkIfMoveIntoSelf(myDirectory, directory);
-    }
-    catch (IncorrectOperationException e) {
-      Messages.showErrorDialog(project, e.getMessage(), RefactoringBundle.message("cannot.move"));
-      return;
-    }
-
     super.doOKAction();
     final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage(directory);
     if (aPackage == null) {