diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9fa15a242b..60222e6a3f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -31,6 +31,7 @@ Changelog
  * Update links to wagtail.io to point to new domain wagtail.org (Jake Howard)
  * Add borders to TypedTableBlock to help visualize rows and columns (Scott Cranfill)
  * Set default submit button label on generic create views to 'Create' instead of 'Save' (Matt Westcott)
+ * Improve display of image listing for long image titles (Krzysztof Jeziorny)
  * Fix: Accessibility fixes for Windows high contrast mode; Dashboard icons colour and contrast (Sakshi Uppoor)
  * Fix: Rename additional 'spin' CSS animations to avoid clashes with other libraries (Kevin Gutiérrez)
  * Fix: `default_app_config` deprecations for Django >= 3.2 (Tibor Leupold)
diff --git a/client/scss/components/_listing.scss b/client/scss/components/_listing.scss
index ac2d08f544..ea82f6933e 100644
--- a/client/scss/components/_listing.scss
+++ b/client/scss/components/_listing.scss
@@ -600,19 +600,19 @@ table.listing {
 
 @include media-breakpoint-up(sm) {
     .listing {
-        &.horiz > li {
-            float: left;
+        &.horiz {
+            display: flex;
+            flex-wrap: wrap;
         }
 
         &.images {
-            @include clearfix();
             border: 1px solid $color-grey-4;
             border-width: 0 0 0 1px;
 
             > li {
                 padding: 1.5em;
                 width: 200px;
-                height: 220px;
+                height: auto;
                 text-align: center;
                 margin-top: -1px;
                 border: 1px solid $color-grey-4;
diff --git a/docs/releases/2.16.md b/docs/releases/2.16.md
index b4ab473532..bb39d8dc6d 100644
--- a/docs/releases/2.16.md
+++ b/docs/releases/2.16.md
@@ -34,6 +34,7 @@
  * When moving pages, default to the current parent section (Tidjani Dia)
  * Add borders to TypedTableBlock to help visualize rows and columns (Scott Cranfill)
  * Set default submit button label on generic create views to 'Create' instead of 'Save' (Matt Westcott)
+ * Improve display of image listing for long image titles (Krzysztof Jeziorny)
 
 ### Bug fixes