diff --git a/idea/src/META-INF/javaScriptDebug.xml b/idea/src/META-INF/javaScriptDebug.xml
new file mode 100644
index 00000000000..942117a878d
--- /dev/null
+++ b/idea/src/META-INF/javaScriptDebug.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.jetbrains">
+    <javaScriptBreakpointAware implementation="org.jetbrains.jet.plugin.debugger.KotlinJavaScriptBreakpointAware"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 3c958bffa0d..e6ce0dbf436 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -11,6 +11,7 @@
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="testng-j.xml">TestNG-J</depends>
   <depends optional="true" config-file="kotlin-copyright.xml">com.intellij.copyright</depends>
+  <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
 
   <project-components>
     <component>
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinJavaScriptBreakpointAware.java b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinJavaScriptBreakpointAware.java
new file mode 100644
index 00000000000..6c9c0958090
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinJavaScriptBreakpointAware.java
@@ -0,0 +1,22 @@
+package org.jetbrains.jet.plugin.debugger;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.PairProcessor;
+import org.jetbrains.jet.plugin.JetFileType;
+import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector;
+
+public class KotlinJavaScriptBreakpointAware implements PairProcessor<VirtualFile, Project> {
+    @Override
+    public boolean process(VirtualFile file, Project project) {
+        if (file.getFileType() == JetFileType.INSTANCE) {
+            Module module = ModuleUtilCore.findModuleForFile(file, project);
+            if (module != null) {
+                return KotlinFrameworkDetector.isJsKotlinModule(module);
+            }
+        }
+        return false;
+    }
+}