diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml
index 23f9231230..7417a58126 100644
--- a/plugins/3MFReader/WorkspaceDialog.qml
+++ b/plugins/3MFReader/WorkspaceDialog.qml
@@ -101,7 +101,7 @@ UM.Dialog
                     }
 
                     comboboxTitle: catalog.i18nc("@action:label", "Open With")
-                    comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
+                    comboboxTooltipText: catalog.i18nc("@info:tooltip", "Printer settings will be updated to match the settings saved with the project.")
                     comboboxVisible: workspaceDialog.visible && manager.updatableMachinesModel.count > 1
                     combobox: Cura.MachineSelector
                     {
@@ -188,7 +188,6 @@ UM.Dialog
                         }
                     }
 
-                    comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the profile be resolved?")
                     comboboxVisible: manager.qualityChangesConflict
                     combobox: Cura.ComboBox
                     {
@@ -231,7 +230,6 @@ UM.Dialog
                         }
                     }
 
-                    comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
                     comboboxVisible: manager.materialConflict
 
                     combobox: Cura.ComboBox
diff --git a/plugins/3MFReader/WorkspaceSection.qml b/plugins/3MFReader/WorkspaceSection.qml
index 211d8776f3..b11cc04cd7 100644
--- a/plugins/3MFReader/WorkspaceSection.qml
+++ b/plugins/3MFReader/WorkspaceSection.qml
@@ -23,41 +23,6 @@ Item
     height: childrenRect.height
     anchors.leftMargin: UM.Theme.getSize("default_margin").width
 
-    UM.TooltipArea
-    {
-        id: comboboxTooltip
-        width: (parent.width / 2.5) | 0
-        height: visible ? UM.Theme.getSize("default_margin").height : 0
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.rightMargin: UM.Theme.getSize("default_margin").width
-
-        text: comboboxTooltipText
-        visible: comboboxVisible
-
-        UM.Label
-        {
-            id: comboboxLabel
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
-            visible: comboboxVisible && text != ""
-            text: ""
-            font: UM.Theme.getFont("default_bold")
-        }
-
-        Loader
-        {
-            id: comboboxLoader
-            width: parent.width
-            height: UM.Theme.getSize("button").height
-            anchors.top: comboboxLabel.bottom
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
-            anchors.left: parent.left
-            sourceComponent: combobox
-        }
-    }
-
     Row
     {
         id: sectionTitleRow
@@ -82,6 +47,69 @@ Item
         }
     }
 
+    Item
+    {
+        id: comboboxTooltip
+        width: (parent.width / 2.5) | 0
+        height: visible ? UM.Theme.getSize("default_margin").height : 0
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.rightMargin: UM.Theme.getSize("default_margin").width
+        visible: comboboxVisible
+
+        UM.Label
+        {
+            id: comboboxLabel
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            visible: comboboxVisible && text != ""
+            text: ""
+            font: UM.Theme.getFont("default_bold")
+        }
+
+        Loader
+        {
+            id: comboboxLoader
+            width: parent.width
+            height: UM.Theme.getSize("button").height
+            anchors.top: comboboxLabel.bottom
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.left: parent.left
+            sourceComponent: combobox
+        }
+
+        MouseArea
+        {
+            id: helpIconMouseArea
+            anchors.right: parent.right
+            anchors.verticalCenter: comboboxLabel.verticalCenter
+            width: childrenRect.width
+            height: childrenRect.height
+            hoverEnabled: true
+
+            UM.ColorImage
+            {
+                width: UM.Theme.getSize("section_icon").width
+                height: width
+
+                visible: comboboxTooltipText != ""
+                source: UM.Theme.getIcon("Help")
+
+                UM.ToolTip
+                {
+                    text: comboboxTooltipText
+                    visible: helpIconMouseArea.containsMouse
+                    targetPoint: Qt.point(parent.x + Math.round(parent.width / 2), parent.y)
+                    x: 0
+                    y: parent.y + parent.height + UM.Theme.getSize("default_margin").height
+                    width: UM.Theme.getSize("tooltip").width
+                }
+            }
+        }
+    }
+
+
     Loader
     {
         width: parent.width