diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py
index d9c4ee9e9a..d7d1380f9b 100644
--- a/plugins/3MFWriter/ThreeMFWriter.py
+++ b/plugins/3MFWriter/ThreeMFWriter.py
@@ -276,6 +276,7 @@ class ThreeMFWriter(MeshWriter):
                                   title=catalog.i18nc("@info:title", "Failed to save material package information"),
                                   message_type=Message.MessageType.WARNING)
                 message.show()
+                continue
 
             if package_data.get("is_bundled"):
                 continue
diff --git a/resources/qml/MachineSettings/GcodeTextArea.qml b/resources/qml/MachineSettings/GcodeTextArea.qml
index 7791e169c2..d4bc58cdc4 100644
--- a/resources/qml/MachineSettings/GcodeTextArea.qml
+++ b/resources/qml/MachineSettings/GcodeTextArea.qml
@@ -67,6 +67,8 @@ UM.TooltipArea
             font: UM.Theme.getFont("fixed")
             renderType: Text.NativeRendering
             color: UM.Theme.getColor("text")
+            selectionColor: UM.Theme.getColor("text_selection")
+            selectedTextColor: UM.Theme.getColor("text")
             wrapMode: TextEdit.NoWrap
 
             onActiveFocusChanged:
@@ -91,7 +93,7 @@ UM.TooltipArea
                     }
                     if (gcodeTextArea.hovered || gcodeTextArea.activeFocus)
                     {
-                        return UM.Theme.getColor("border_main")
+                        return UM.Theme.getColor("text_field_border_active")
                     }
                     return UM.Theme.getColor("border_field_light")
                 }