diff --git a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
index ff4bc6f5b392..d5de75a85d18 100644
--- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
@@ -54,7 +54,7 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
       final PsiClass[] psiClasses = fileMap.values().iterator().next();
       return psiClasses != null && psiClasses.length > 1;
     }
-    return false;
+    return true;
   }
 
   @Override
@@ -65,6 +65,7 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
     return canCopyClass(false, elements);
   }
   public static boolean canCopyClass(boolean fromUpdate, PsiElement... elements) {
+    if (fromUpdate && elements.length > 0 && elements[0] instanceof PsiDirectory) return true;
     return convertToTopLevelClasses(elements, fromUpdate, null, null) != null;
   }