diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
index 5f1d3729f6eb..85eb284522e3 100755
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
@@ -186,8 +186,10 @@ public class MavenFoldersImporter {
 
     myModel.unregisterAll(targetDir.getPath(), true, false);
 
-    myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(true), true, true);
-    myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(false), false, true);
+    if (myImportingSettings.getGeneratedSourcesFolder() != MavenImportingSettings.GeneratedSourcesFolder.IGNORE) {
+      myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(true), true, true);
+      myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(false), false, true);
+    }
 
     File[] targetChildren = targetDir.listFiles();
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
index 248c3cd67b97..fa0857650c3c 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
@@ -608,6 +608,25 @@ public class FoldersImportingTest extends MavenImportingTestCase {
                   "target/generated-sources");
   }
 
+  public void testIgnoreGeneratedSources() throws Exception {
+    createStdProjectFolders();
+
+    MavenProjectsManager.getInstance(myProject).getImportingSettings().setGeneratedSourcesFolder(
+      MavenImportingSettings.GeneratedSourcesFolder.IGNORE);
+
+    createProjectSubFile("target/generated-sources/annotations/A.java", "package com; class A {}");
+    createProjectSubFile("target/generated-sources/annotations/com/B.java", "package com; class B {}");
+
+    importProject("<groupId>test</groupId>" +
+                  "<artifactId>project</artifactId>" +
+                  "<version>1</version>");
+
+    assertSources("project",
+                  "src/main/java",
+                  "src/main/resources");
+  }
+
+
   public void testAddingExistingGeneratedSources4() throws Exception {
     createStdProjectFolders();