diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bfb5fc0dc1..d556faaf24 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -167,6 +167,7 @@ Changelog
  * Fix: Ensure `DocumentChooserBlock` can be deconstructed for migrations (Matt Westcott)
  * Fix: Resolve frontent console error and unintented console logging issues (Matt Wescott, Paarth Agarwal)
  * Fix: Resolve issue with sites that have not yet migrated away from `BaseSetting` when upgrading to Wagtail 4.0 (Stefan Hammer)
+ * Fix: Use correct classnames for showing/hiding edit button on chooser widget (Matt Wescott)
 
 
 3.0.1 (16.06.2022)
diff --git a/client/src/components/ChooserWidget/index.js b/client/src/components/ChooserWidget/index.js
index 7c0b3c4af2..90f10aa75f 100644
--- a/client/src/components/ChooserWidget/index.js
+++ b/client/src/components/ChooserWidget/index.js
@@ -94,9 +94,9 @@ export class Chooser {
       const editUrl = newState[this.editUrlStateKey];
       if (editUrl) {
         this.editLink.setAttribute('href', editUrl);
-        this.editLink.classList.remove('u-hidden');
+        this.editLink.classList.remove('w-hidden');
       } else {
-        this.editLink.classList.add('u-hidden');
+        this.editLink.classList.add('w-hidden');
       }
     }
   }
diff --git a/docs/releases/4.0.md b/docs/releases/4.0.md
index c1820e5721..1b25f061ca 100644
--- a/docs/releases/4.0.md
+++ b/docs/releases/4.0.md
@@ -224,6 +224,7 @@ The bulk of these enhancements have been from Paarth Agarwal, who has been doing
  * Ensure `DocumentChooserBlock` can be deconstructed for migrations (Matt Westcott)
  * Resolve frontent console error and unintented console logging issues (Matt Wescott, Paarth Agarwal)
  * Resolve issue with sites that have not yet migrated away from `BaseSetting` when upgrading to Wagtail 4.0 (Stefan Hammer)
+ * Use correct classnames for showing/hiding edit button on chooser widget (Matt Wescott)
 
 
 ## Upgrade considerations