diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index c63391f624..c02971d8dd 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -450,6 +450,7 @@ Cura.MachineAction
                             Label
                             {
                                 text: catalog.i18nc("@label", "Start Gcode")
+                                font.bold: true
                             }
                             TextArea
                             {
@@ -457,7 +458,6 @@ Cura.MachineAction
                                 width: parent.width
                                 height: parent.height - y
                                 font: UM.Theme.getFont("fixed")
-                                wrapMode: TextEdit.NoWrap
                                 text: machineStartGcodeProvider.properties.value
                                 onActiveFocusChanged:
                                 {
@@ -466,6 +466,10 @@ Cura.MachineAction
                                         machineStartGcodeProvider.setPropertyValue("value", machineStartGcodeField.text)
                                     }
                                 }
+                                Component.onCompleted:
+                                {
+                                    wrapMode = TextEdit.NoWrap;
+                                }
                             }
                         }
 
@@ -475,6 +479,7 @@ Cura.MachineAction
                             Label
                             {
                                 text: catalog.i18nc("@label", "End Gcode")
+                                font.bold: true
                             }
                             TextArea
                             {
@@ -482,7 +487,6 @@ Cura.MachineAction
                                 width: parent.width
                                 height: parent.height - y
                                 font: UM.Theme.getFont("fixed")
-                                wrapMode: TextEdit.NoWrap
                                 text: machineEndGcodeProvider.properties.value
                                 onActiveFocusChanged:
                                 {
@@ -491,6 +495,10 @@ Cura.MachineAction
                                         machineEndGcodeProvider.setPropertyValue("value", machineEndGcodeField.text)
                                     }
                                 }
+                                Component.onCompleted:
+                                {
+                                    wrapMode = TextEdit.NoWrap;
+                                }
                             }
                         }
                     }
@@ -552,7 +560,7 @@ Cura.MachineAction
 
                         Label
                         {
-                            text: catalog.i18nc("@label", "Printer Settings")
+                            text: catalog.i18nc("@label", "Nozzle Settings")
                             font.bold: true
                         }
 
@@ -616,6 +624,7 @@ Cura.MachineAction
                                 Label
                                 {
                                     text: catalog.i18nc("@label", "Extruder Start Gcode")
+                                    font.bold: true
                                 }
                                 TextArea
                                 {
@@ -623,8 +632,7 @@ Cura.MachineAction
                                     width: parent.width
                                     height: parent.height - y
                                     font: UM.Theme.getFont("fixed")
-                                    wrapMode: TextEdit.NoWrap
-                                    text: extruderStartGcodeProvider.properties.value
+                                    text: (extruderStartGcodeProvider.properties.value) ? extruderStartGcodeProvider.properties.value : ""
                                     onActiveFocusChanged:
                                     {
                                         if(!activeFocus)
@@ -632,6 +640,10 @@ Cura.MachineAction
                                             extruderStartGcodeProvider.setPropertyValue("value", extruderStartGcodeField.text)
                                         }
                                     }
+                                    Component.onCompleted:
+                                    {
+                                        wrapMode = TextEdit.NoWrap;
+                                    }
                                 }
                             }
                             Column {
@@ -640,6 +652,7 @@ Cura.MachineAction
                                 Label
                                 {
                                     text: catalog.i18nc("@label", "Extruder End Gcode")
+                                    font.bold: true
                                 }
                                 TextArea
                                 {
@@ -647,8 +660,7 @@ Cura.MachineAction
                                     width: parent.width
                                     height: parent.height - y
                                     font: UM.Theme.getFont("fixed")
-                                    wrapMode: TextEdit.NoWrap
-                                    text: extruderEndGcodeProvider.properties.value
+                                    text: (extruderEndGcodeProvider.properties.value) ? extruderEndGcodeProvider.properties.value : ""
                                     onActiveFocusChanged:
                                     {
                                         if(!activeFocus)
@@ -656,6 +668,10 @@ Cura.MachineAction
                                             extruderEndGcodeProvider.setPropertyValue("value", extruderEndGcodeField.text)
                                         }
                                     }
+                                    Component.onCompleted:
+                                    {
+                                        wrapMode = TextEdit.NoWrap;
+                                    }
                                 }
                             }
                         }
@@ -674,7 +690,7 @@ Cura.MachineAction
             TextField
             {
                 id: textField
-                text: propertyProvider.properties.value
+                text: (propertyProvider.properties.value) ? propertyProvider.properties.value : ""
                 validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
                 onEditingFinished:
                 {