diff --git a/CHANGES.txt b/CHANGES.txt
index 3653e89ab4..c6ceac0575 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@ Merged from 4.0:
  * Restore internode custom tracing on 4.0's new messaging system (CASSANDRA-17981)
 Merged from 3.11:
 Merged from 3.0:
+ * Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira (CASSANDRA-18126)
  * Avoid anticompaction mixing data from two different time windows with TWCS (CASSANDRA-17970)
  * Do not spam the logs with MigrationCoordinator not being able to pull schemas (CASSANDRA-18096)
 
diff --git a/ide/idea/vcs.xml b/ide/idea/vcs.xml
index 94a25f7f4c..81872fd3f1 100644
--- a/ide/idea/vcs.xml
+++ b/ide/idea/vcs.xml
@@ -3,4 +3,14 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="CASSANDRA-(\d+)" />
+          <option name="linkRegexp" value="https://issues.apache.org/jira/browse/CASSANDRA-$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
 </project>
\ No newline at end of file