diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyProjectComponent.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyProjectComponent.java
index bd46962b4ada..ff63e3ec1d6f 100644
--- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyProjectComponent.java
+++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyProjectComponent.java
@@ -12,18 +12,20 @@ import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.keymap.Keymap;
-import com.intellij.openapi.keymap.KeymapManager;
+import com.intellij.openapi.keymap.ex.KeymapManagerEx;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupManager;
+import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileAdapter;
 import com.intellij.openapi.vfs.VirtualFileEvent;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.wm.*;
+import com.intellij.util.containers.hash.HashMap;
 import com.jetbrains.edu.EduNames;
 import com.jetbrains.edu.EduUtils;
 import com.jetbrains.edu.courseFormat.Course;
@@ -40,18 +42,18 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 
 public class StudyProjectComponent implements ProjectComponent {
   private static final Logger LOG = Logger.getInstance(StudyProjectComponent.class.getName());
-  private static Map<String, String> myDeletedShortcuts = new HashMap<String, String>();
   private final Project myProject;
 
   private FileCreatedByUserListener myListener;
 
+  private Map<Keymap, List<Pair<String, String>>> myDeletedShortcuts = new HashMap<Keymap, List<Pair<String, String>>>();
   private StudyProjectComponent(@NotNull final Project project) {
     myProject = project;
   }
@@ -124,15 +126,14 @@ public class StudyProjectComponent implements ProjectComponent {
     });
   }
 
-  private static void registerShortcuts() {
-    addShortcut(StudyNextWindowAction.SHORTCUT, StudyNextWindowAction.ACTION_ID, false);
-    addShortcut(StudyPrevWindowAction.SHORTCUT, StudyPrevWindowAction.ACTION_ID, false);
-    addShortcut(StudyShowHintAction.SHORTCUT, StudyShowHintAction.ACTION_ID, false);
-    addShortcut(StudyNextWindowAction.SHORTCUT2, StudyNextWindowAction.ACTION_ID, true);
-    addShortcut(StudyCheckAction.SHORTCUT, StudyCheckAction.ACTION_ID, false);
-    addShortcut(StudyNextStudyTaskAction.SHORTCUT, StudyNextStudyTaskAction.ACTION_ID, false);
-    addShortcut(StudyPreviousStudyTaskAction.SHORTCUT, StudyPreviousStudyTaskAction.ACTION_ID, false);
-    addShortcut(StudyRefreshTaskFileAction.SHORTCUT, StudyRefreshTaskFileAction.ACTION_ID, false);
+  private void registerShortcuts() {
+    addShortcut(StudyNextWindowAction.ACTION_ID, new String[]{StudyNextWindowAction.SHORTCUT, StudyNextWindowAction.SHORTCUT2});
+    addShortcut(StudyPrevWindowAction.ACTION_ID, new String[]{StudyPrevWindowAction.SHORTCUT});
+    addShortcut(StudyShowHintAction.ACTION_ID, new String[]{StudyShowHintAction.SHORTCUT});
+    addShortcut(StudyCheckAction.ACTION_ID, new String[]{StudyCheckAction.SHORTCUT});
+    addShortcut(StudyNextStudyTaskAction.ACTION_ID, new String[]{StudyNextStudyTaskAction.SHORTCUT});
+    addShortcut(StudyPreviousStudyTaskAction.ACTION_ID, new String[]{StudyPreviousStudyTaskAction.SHORTCUT});
+    addShortcut(StudyRefreshTaskFileAction.ACTION_ID, new String[]{StudyRefreshTaskFileAction.SHORTCUT});
   }
 
   private void registerToolWindows(@NotNull final ToolWindowManager toolWindowManager) {
@@ -197,19 +198,24 @@ public class StudyProjectComponent implements ProjectComponent {
     }
   }
 
-  private static void addShortcut(@NotNull final String shortcutString, @NotNull final String actionIdString, boolean isAdditional) {
-    Keymap keymap = KeymapManager.getInstance().getActiveKeymap();
-    Shortcut[] shortcuts = keymap.getShortcuts(actionIdString);
-    if (shortcuts.length > 0 && !isAdditional) {
-      return;
+  private void addShortcut(@NotNull final String actionIdString, @NotNull final String[] shortcuts) {
+    KeymapManagerEx keymapManager = KeymapManagerEx.getInstanceEx();
+    for (Keymap keymap : keymapManager.getAllKeymaps()) {
+      List<Pair<String, String>> pairs = myDeletedShortcuts.get(keymap);
+      if (pairs == null) {
+        pairs = new ArrayList<Pair<String, String>>();
+        myDeletedShortcuts.put(keymap, pairs);
+      }
+      for (String shortcutString : shortcuts) {
+        Shortcut studyActionShortcut = new KeyboardShortcut(KeyStroke.getKeyStroke(shortcutString), null);
+        String[] actionsIds = keymap.getActionIds(studyActionShortcut);
+        for (String actionId : actionsIds) {
+          pairs.add(Pair.create(actionId, shortcutString));
+          keymap.removeShortcut(actionId, studyActionShortcut);
+        }
+        keymap.addShortcut(actionIdString, studyActionShortcut);
+      }
     }
-    Shortcut studyActionShortcut = new KeyboardShortcut(KeyStroke.getKeyStroke(shortcutString), null);
-    String[] actionsIds = keymap.getActionIds(studyActionShortcut);
-    for (String actionId : actionsIds) {
-      myDeletedShortcuts.put(actionId, shortcutString);
-      keymap.removeShortcut(actionId, studyActionShortcut);
-    }
-    keymap.addShortcut(actionIdString, studyActionShortcut);
   }
 
   @Override
@@ -224,13 +230,15 @@ public class StudyProjectComponent implements ProjectComponent {
       if (progressToolWindow != null) {
         progressToolWindow.getContentManager().removeAllContents(false);
       }
-      if (!myDeletedShortcuts.isEmpty()) {
-        for (Map.Entry<String, String> shortcut : myDeletedShortcuts.entrySet()) {
-          final Keymap keymap = KeymapManager.getInstance().getActiveKeymap();
-          final Shortcut actionShortcut = new KeyboardShortcut(KeyStroke.getKeyStroke(shortcut.getValue()), null);
-          keymap.addShortcut(shortcut.getKey(), actionShortcut);
+      KeymapManagerEx keymapManager = KeymapManagerEx.getInstanceEx();
+      for (Keymap keymap : keymapManager.getAllKeymaps()) {
+        List<Pair<String, String>> pairs = myDeletedShortcuts.get(keymap);
+        if (pairs != null && !pairs.isEmpty()) {
+          for (Pair<String, String> actionShortcut : pairs) {
+            keymap.addShortcut(actionShortcut.first, new KeyboardShortcut(KeyStroke.getKeyStroke(actionShortcut.second), null));
+          }
         }
-      }
+       }
     }
     myListener = null;
   }