diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index 0cd70970c8..37789b23a1 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -629,6 +629,16 @@ class MachineManager(QObject):
                 intent_category = category
         return intent_category
 
+    # Returns the human-readable name of the active intent category. If the intent category is "default", returns an
+    # empty string.
+    @pyqtProperty(str, notify = activeIntentChanged)
+    def activeIntentName(self) -> str:
+        intent_category = self.activeIntentCategory
+        if intent_category == "default":
+            intent_category = ""
+        intent_name = intent_category.capitalize()
+        return intent_name
+
     # Provies a list of extruder positions that have a different intent from the active one.
     @pyqtProperty("QStringList", notify=activeIntentChanged)
     def extruderPositionsWithNonActiveIntent(self):
@@ -1663,11 +1673,25 @@ class MachineManager(QObject):
             return global_container_stack.qualityChanges.getName()
         return global_container_stack.quality.getName()
 
+    @pyqtProperty(str, notify = activeQualityChanged)
+    def activeQualityName(self) -> str:
+        global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
+        if global_stack is None:
+            return empty_quality_container.getName()
+        return global_stack.quality.getName()
+
     @pyqtProperty(bool, notify = activeQualityGroupChanged)
     def hasNotSupportedQuality(self) -> bool:
         global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
         return (not global_container_stack is None) and global_container_stack.quality == empty_quality_container and global_container_stack.qualityChanges == empty_quality_changes_container
 
+    @pyqtProperty(bool, notify = activeQualityGroupChanged)
+    def isActiveQualityCustom(self) -> bool:
+        global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
+        if global_stack is None:
+            return False
+        return global_stack.qualityChanges != empty_quality_changes_container
+
     def _updateUponMaterialMetadataChange(self) -> None:
         if self._global_container_stack is None:
             return
diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
index c45a5fa8d7..33e2888fbb 100644
--- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
+++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
@@ -88,14 +88,18 @@ Item
 
             function generateActiveQualityText()
             {
+                var result = Cura.MachineManager.activeQualityOrQualityChangesName
 
-                var result = ""
-                if(Cura.MachineManager.activeIntentCategory != "default")
+                // If this is a custom quality, add intent (if present) and quality it is based on
+                if (Cura.MachineManager.isActiveQualityCustom)
                 {
-                    result += Cura.MachineManager.activeIntentCategory + " - "
+                    if (Cura.MachineManager.activeIntentName != "")
+                    {
+                        result += " - " + Cura.MachineManager.activeIntentName
+                    }
+                    result += " - " + Cura.MachineManager.activeQualityName
                 }
 
-                result += Cura.MachineManager.activeQualityOrQualityChangesName
                 if (Cura.MachineManager.isActiveQualityExperimental)
                 {
                     result += " (Experimental)"
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
index 5628867922..9340f64d89 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
@@ -20,13 +20,18 @@ RowLayout
         {
             if (Cura.MachineManager.activeStack)
             {
-                var text = ""
-                if(Cura.MachineManager.activeIntentCategory != "default")
+                var text = Cura.MachineManager.activeQualityOrQualityChangesName
+
+                // If this is a custom quality, add intent (if present) and quality it is based on
+                if (Cura.MachineManager.isActiveQualityCustom)
                 {
-                    text += Cura.MachineManager.activeIntentCategory + " - "
+                    if (Cura.MachineManager.activeIntentName != "")
+                    {
+                        text += " - " + Cura.MachineManager.activeIntentName
+                    }
+                    text += " - " + Cura.MachineManager.activeQualityName
                 }
 
-                text += Cura.MachineManager.activeQualityOrQualityChangesName
                 if (!Cura.MachineManager.hasNotSupportedQuality)
                 {
                     text += " - " + layerHeight.properties.value + "mm"