diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 496b01b64d..00e118daf0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,7 +28,7 @@ Changelog
  * Fix: Output form media on add/edit image forms with custom models (Matt Westcott)
  * Fix: Layout for the clear checkbox in default FileField widget (Mikalai Radchuk)
  * Fix: Remove ASCII conversion from Postgres search backend, to support stemming in non-Latin alphabets (Pavel Denisov)
- * Update release schedule info and move to wiki, linked from docs and readme (Matt Westcott)
+ * Fix: Prevent tab labels on page edit view from being cut off on very narrow screens (Kevin Howbrook)
 
 
 2.6.1 (05.08.2019)
diff --git a/client/scss/components/_tabs.scss b/client/scss/components/_tabs.scss
index 5ee059ae7f..c9f33422a4 100644
--- a/client/scss/components/_tabs.scss
+++ b/client/scss/components/_tabs.scss
@@ -148,6 +148,6 @@
     }
 
     .tab-nav li {
-        width: 25%;
+        width: auto;
     }
 }
diff --git a/docs/releases/2.7.rst b/docs/releases/2.7.rst
index 55eecb659e..9515db23b7 100644
--- a/docs/releases/2.7.rst
+++ b/docs/releases/2.7.rst
@@ -53,6 +53,7 @@ Bug fixes
  * Output form media on add/edit image forms with custom models (Matt Westcott)
  * Fixes layout for the clear checkbox in default FileField widget (Mikalai Radchuk)
  * Remove ASCII conversion from Postgres search backend, to support stemming in non-Latin alphabets (Pavel Denisov)
+ * Prevent tab labels on page edit view from being cut off on very narrow screens (Kevin Howbrook)
 
 
 Upgrade considerations