diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4dae73ebb1..ae24fdb222 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ Changelog
 ~~~~~~~~~~~~~~~~~~
 
  * Fix: Ensure Cloudfront cache invalidation is called with a list, for compatibility with current botocore versions (Jake Howard)
+ * Fix: Ensure Draftail features wrap when a large amount of features are added (Bart Cieliński)
  * Docs: Update tutorial to reflect the move of the "Add child page" action to a top-level button in the header as a '+' icon (Clifford Gama)
 
 
diff --git a/client/src/components/Draftail/Draftail.scss b/client/src/components/Draftail/Draftail.scss
index 18e87ca358..7a357c0cb5 100644
--- a/client/src/components/Draftail/Draftail.scss
+++ b/client/src/components/Draftail/Draftail.scss
@@ -212,6 +212,7 @@ $draftail-editor-font-family: theme('fontFamily.sans');
 
 .Draftail-ToolbarGroup {
   display: flex;
+  flex-wrap: wrap;
 }
 
 .Draftail-ToolbarGroup::before {
diff --git a/docs/releases/6.3.2.md b/docs/releases/6.3.2.md
index 1a6866b523..114a53c94b 100644
--- a/docs/releases/6.3.2.md
+++ b/docs/releases/6.3.2.md
@@ -15,6 +15,7 @@ depth: 1
 ### Bug fixes
 
  * Ensure Cloudfront cache invalidation is called with a list, for compatibility with current botocore versions (Jake Howard)
+ * Ensure Draftail features wrap when a large amount of features are added (Bart Cieliński)
 
 ### Documentation