diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java
index f56fad045087..3baf3725f6ee 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.java
@@ -45,6 +45,7 @@ public abstract class DebugProcessImpl<C extends VmConnection> extends XDebugPro
   protected volatile StepAction lastStep;
   protected volatile CallFrame lastCallFrame;
   protected volatile boolean isForceStep;
+  protected volatile boolean disableDoNotStepIntoLibraries;
 
   protected final ConcurrentMap<Url, VirtualFile> urlToFileCache = ContainerUtil.newConcurrentMap();
 
@@ -192,6 +193,7 @@ public abstract class DebugProcessImpl<C extends VmConnection> extends XDebugPro
       lastStep = null;
       lastCallFrame = null;
       urlToFileCache.clear();
+      disableDoNotStepIntoLibraries = false;
     }
     else {
       lastStep = stepAction;
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 75e2161dad42..2fe90b2d06e8 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -488,6 +488,7 @@ spy.js.realtime.evaluation=false
 spy.js.realtime.evaluation.description=Enables spy-js autocomplete and realtime evaluation
 
 js.debugger.step.over.skip.same.line=true
+js.debugger.skip.native.scripts=true
 js.debugger.trace.resume=false
 js.debugger.v8.lazy.compilation=false