diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index a278842482b..1cc6883bb15 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -977,6 +977,11 @@ def _save_right_side(self, selector):
         new_device_info["encrypted"] = encrypted
 
         # FS LABEL
+        # The Linux HFS+ ESP partition needs to have the correct FS label.
+        # Override anything the user sets for it.
+        if fs_type == "macefi":
+            self._labelEntry.set_text(new_fs.label)
+
         label = self._labelEntry.get_text()
         old_label = getattr(device.format, "label", "")
         changed_label = (label != old_label)