diff --git a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java
index d81fba56bf..532d8c8590 100644
--- a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java
+++ b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java
@@ -486,12 +486,12 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
             if (systemFolder == null) {
                 Folder folder = createFolder(getRepositoryContext().getProject(), sqlpatternsType, categoryPath,
                         systemPath.lastSegment());
-                ((FolderItem) folder.getProperty().getItem()).setType(FolderType.SYSTEM_FOLDER_LITERAL);
+                ((FolderItem) folder.getProperty().getItem()).setType(FolderType.FOLDER_LITERAL);
             }
             if (folderHelper.getFolder(parentPath.append(userPath)) == null) {
                 Folder folder = createFolder(getRepositoryContext().getProject(), sqlpatternsType, categoryPath,
                         userPath.lastSegment());
-                ((FolderItem) folder.getProperty().getItem()).setType(FolderType.SYSTEM_FOLDER_LITERAL);
+                ((FolderItem) folder.getProperty().getItem()).setType(FolderType.FOLDER_LITERAL);
             }
             //
             if (existingItem == null) {
diff --git a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java
index f676d8d661..fd6212dc27 100644
--- a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java
+++ b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java
@@ -329,7 +329,7 @@ public abstract class FolderHelper {
             final EObject parent = folder.getParent();
             if (parent instanceof FolderItem) {
                 FolderItem parentFolder = (FolderItem) parent;
-                if (parentFolder.getParent() instanceof Project) {
+                if (FolderType.SYSTEM_FOLDER_LITERAL.equals(parentFolder.getType())) {
                     if (path == null) {
                         path = "";
                     }