diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0e7e12989d..610a511088 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -32,6 +32,7 @@ Changelog
 ~~~~~~~~~~~~~~~~~~
 
  * Fix: Site.get_site_root_paths() preferring other sites over the default when some sites share the same root_page (Andy Babic)
+ * Fix: Rich text image chooser no longer skips format selection after a validation error (Matt Westcott)
 
 
 2.1 (22.05.2018)
diff --git a/docs/releases/2.1.1.rst b/docs/releases/2.1.1.rst
index 60d15310f4..ee63335e23 100644
--- a/docs/releases/2.1.1.rst
+++ b/docs/releases/2.1.1.rst
@@ -14,3 +14,4 @@ Bug fixes
 ~~~~~~~~~
 
  * Fix ``Site.get_site_root_paths()`` preferring other sites over the default when some sites share the same root_page (Andy Babic)
+ * Rich text image chooser no longer skips format selection after a validation error (Matt Westcott)