diff --git a/.gitignore b/.gitignore
index c447f28b73..a5f8ce2653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
-.idea
+**/.idea/*
+!/.idea/vcs.xml
 *.iml
 .gradle
 .gradletasknamecache
 build
 out
 target
-local.properties
\ No newline at end of file
+local.properties
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..9ea55e627a
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/Kotlin/kotlinx.coroutines/issues/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file