diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
index 61d0323f968c..94573e76c17c 100644
--- a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
+++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
@@ -104,9 +104,11 @@ public class CCProjectComponent extends AbstractProjectComponent {
   }
 
   public void projectOpened() {
-    migrateIfNeeded();
-    VirtualFileManager.getInstance().addVirtualFileListener(myTaskFileLifeListener);
-    EduUsagesCollector.projectTypeOpened(CCUtils.COURSE_MODE);
+    if (CCUtils.isCourseCreator(myProject)) {
+      migrateIfNeeded();
+      VirtualFileManager.getInstance().addVirtualFileListener(myTaskFileLifeListener);
+      EduUsagesCollector.projectTypeOpened(CCUtils.COURSE_MODE);
+    }
   }
 
   public void projectClosed() {
diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java
index cfc2e0dd636b..7a2f28b61b4a 100644
--- a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java
+++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java
@@ -16,8 +16,6 @@ import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
-
 public class CCVirtualFileListener implements VirtualFileListener {
 
   @Override
@@ -37,7 +35,7 @@ public class CCVirtualFileListener implements VirtualFileListener {
       return;
     }
     Course course = StudyTaskManager.getInstance(project).getCourse();
-    if (course == null || !CCUtils.isCourseCreator(project)) {
+    if (course == null) {
       return;
     }
     TaskFile taskFile = StudyUtils.getTaskFile(project, createdFile);