diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8703a8ec8..2a8295c5a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -46,6 +46,10 @@ Detailed list of changes
 0.32.0 [future]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+- :ref:`conditional_mappings`
+
+- Support for :ref:`modal_mappings` such as in modal editors like vim
+
 - A new option :opt:`notify_on_cmd_finish` to show a desktop notification when a long running command finishes (:pull:`6817`)
 
 - A new action :ac:`send_key` to simplify mapping key presses to other keys without needing :ac:`send_text`
diff --git a/docs/mapping.rst b/docs/mapping.rst
index 08e03a6de..03eb3fb95 100644
--- a/docs/mapping.rst
+++ b/docs/mapping.rst
@@ -165,6 +165,7 @@ the program running in the terminal, map it to :ac:`discard_event`::
 
     map kitty_mod+f1 discard_event
 
+.. _conditional_mappings:
 
 Conditional mappings depending on the state of the focused window
 ----------------------------------------------------------------------
@@ -227,6 +228,8 @@ you press the :kbd:`alt+s` key. To see this in action, run::
 
 Which will print out what key events it receives.
 
+.. _modal_mappings:
+
 Modal mappings
 --------------------------