diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
index efc81bc33be7..97495aad8f0d 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
@@ -92,8 +92,10 @@ abstract public class StudyTaskNavigationAction extends StudyActionWithShortcut
       VirtualFile srcDir = taskDir.findChild(EduNames.SRC);
       VirtualFile vf = srcDir == null ? taskDir.findChild(name) : srcDir.findChild(name);
       if (vf != null) {
-        FileEditorManager.getInstance(project).openFile(vf, true);
-        if (!taskFile.getAnswerPlaceholders().isEmpty()) {
+        if (shouldBeActive != null) {
+          FileEditorManager.getInstance(project).openFile(vf, true);
+        }
+        if (shouldBeActive == null && !taskFile.getAnswerPlaceholders().isEmpty()) {
           shouldBeActive = vf;
         }
       }