diff --git a/python/educational/course-creator/resources/META-INF/plugin.xml b/python/educational/course-creator/resources/META-INF/plugin.xml
index fb9c60ba782b..84bc4ac32c0f 100644
--- a/python/educational/course-creator/resources/META-INF/plugin.xml
+++ b/python/educational/course-creator/resources/META-INF/plugin.xml
@@ -59,6 +59,9 @@
     <action id="CreateTaskFile" class="com.jetbrains.edu.coursecreator.actions.CCCreateTaskFile">
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
     </action>
+    <action id="AddTaskFile" class="com.jetbrains.edu.coursecreator.actions.CCAddAsTaskFile" text="Add As Task File">
+      <add-to-group group-id="ProjectViewPopupMenu" anchor="first"/>
+    </action>
     <action id="AddTaskWindow" class="com.jetbrains.edu.coursecreator.actions.CCAddAnswerPlaceholder">
       <add-to-group group-id="EditorPopupMenu" anchor="before" relative-to-action="CopyReference"/>
     </action>
diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
new file mode 100644
index 000000000000..43ea51084510
--- /dev/null
+++ b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
@@ -0,0 +1,68 @@
+package com.jetbrains.edu.coursecreator.actions;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.coursecreator.CCProjectService;
+
+import java.io.IOException;
+
+public class CCAddAsTaskFile extends AnAction {
+  private static final Logger LOG = Logger.getInstance(CCAddAsTaskFile.class);
+
+  @Override
+  public void actionPerformed(final AnActionEvent e) {
+    Project project = e.getProject();
+    if (project == null) {
+      return;
+    }
+    final VirtualFile file = CommonDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
+    if (file == null) {
+      return;
+    }
+    Task task = CCProjectService.getInstance(project).getTask(file);
+    if (task == null) {
+      return;
+    }
+    task.addTaskFile(file.getName(), task.getTaskFiles().size());
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        String name = file.getNameWithoutExtension();
+        String extension = file.getExtension();
+        try {
+          file.rename(this, name + ".answer." + extension);
+        }
+        catch (IOException e1) {
+          LOG.error(e1);
+        }
+      }
+    });
+  }
+
+
+  @Override
+  public void update(AnActionEvent e) {
+    Project project = e.getProject();
+    Presentation presentation = e.getPresentation();
+    if (project == null) {
+      presentation.setEnabledAndVisible(false);
+      return;
+    }
+    VirtualFile file = CommonDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
+    if (file == null || file.isDirectory() || CCProjectService.getInstance(project).isAnswerFile(file)) {
+      presentation.setEnabledAndVisible(false);
+      return;
+    }
+    Task task = CCProjectService.getInstance(project).getTask(file);
+    if (task == null) {
+      presentation.setEnabledAndVisible(false);
+    }
+  }
+}