diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index be2d315adf7d..767f706e41e5 100644
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -133,7 +133,7 @@
       <add-to-group group-id="MarkRootGroup"/>
     </action>
 
-    <action overrides="true" id="ForceStepInto" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action id="ForceStepInto" class="com.intellij.openapi.actionSystem.EmptyAction"/>
 
     <group id="TypeHierarchyPopupMenu">
     </group>
diff --git a/python/pluginSrc/META-INF/python-plugin-core.xml b/python/pluginSrc/META-INF/python-plugin-core.xml
index 42eea6e0a5da..2a336d534540 100644
--- a/python/pluginSrc/META-INF/python-plugin-core.xml
+++ b/python/pluginSrc/META-INF/python-plugin-core.xml
@@ -41,7 +41,7 @@
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
 
-    <action overrides="true" id="ForceStepInto" class="com.jetbrains.python.debugger.PyForceStepIntoAction"/>
+    <action id="ForceStepInto" class="com.jetbrains.python.debugger.PyForceStepIntoAction"/>
   </actions>
 
 </idea-plugin>
\ No newline at end of file
diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index 6aedbb9945a4..c8b9c46b7117 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -731,10 +731,10 @@
     </action>
 
     <action id="StepIntoMyCode" class="com.jetbrains.python.debugger.PyStepIntoMyCodeAction" icon="PythonIcons.Python.Debug.StepIntoMyCode"
-            text="Step Into My Code" description="Step to the next line executed ignoring libraries">
+            text="Step Into My Code" description="Step to the next line executed ignoring libraries"
+            use-shortcut-of="ForceStepInto">
       <add-to-group group-id="DebugMainMenu" relative-to-action="StepInto" anchor="after"/>
       <add-to-group group-id="XDebugger.ToolWindow.TopToolbar" relative-to-action="StepInto" anchor="after"/>
-      <keyboard-shortcut keymap="$default" first-keystroke="alt shift F7"/>
     </action>
 
     <group id="PyPackagingMenu" text="Packaging">
diff --git a/python/src/com/jetbrains/python/debugger/PyForceStepIntoAction.java b/python/src/com/jetbrains/python/debugger/PyForceStepIntoAction.java
index 6e03067bcb01..777e32468be6 100644
--- a/python/src/com/jetbrains/python/debugger/PyForceStepIntoAction.java
+++ b/python/src/com/jetbrains/python/debugger/PyForceStepIntoAction.java
@@ -21,13 +21,10 @@ import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.Project;
-import com.intellij.xdebugger.impl.DebuggerSupport;
-import com.intellij.xdebugger.impl.actions.DebuggerActionHandler;
-import com.intellij.xdebugger.impl.actions.XDebuggerActionBase;
+import com.intellij.xdebugger.impl.actions.ForceStepIntoAction;
 import com.jetbrains.python.run.AbstractPythonRunConfiguration;
-import org.jetbrains.annotations.NotNull;
 
-public class PyForceStepIntoAction extends XDebuggerActionBase {
+public class PyForceStepIntoAction extends ForceStepIntoAction {
   @Override
   protected boolean isEnabled(AnActionEvent e) {
     Project project = e.getData(CommonDataKeys.PROJECT);
@@ -43,10 +40,4 @@ public class PyForceStepIntoAction extends XDebuggerActionBase {
 
     return super.isEnabled(e);
   }
-
-  @NotNull
-  @Override
-  protected DebuggerActionHandler getHandler(@NotNull DebuggerSupport debuggerSupport) {
-    return debuggerSupport.getForceStepIntoHandler();
-  }
 }