diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
index 411dc44f83..ee189ab73c 100644
--- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
+++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
@@ -20,11 +20,18 @@ UM.Dialog
 
     property bool dontShowAgain: true
 
-    onClosing: UM.Preferences.setValue("cura/dialog_on_project_save", !dontShowAgainCheckbox.checked)
+    function storeDontShowAgain()
+    {
+        UM.Preferences.setValue("cura/dialog_on_project_save", !dontShowAgainCheckbox.checked)
+        UM.Preferences.setValue("asked_dialog_on_project_save", true)
+    }
 
+    onClosing: storeDontShowAgain()
+    onRejected: storeDontShowAgain()
+    onAccepted: storeDontShowAgain()
     onVisibleChanged:
     {
-        if(visible)
+        if(visible && UM.Preferences.getValue("cura/asked_dialog_on_project_save"))
         {
             dontShowAgain = !UM.Preferences.getValue("cura/dialog_on_project_save")
         }
diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
index 3755f0ead1..2950714d6a 100644
--- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
+++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
@@ -38,6 +38,7 @@ UM.TooltipArea
 
     property alias textField: textFieldWithUnit
     property alias valueText: textFieldWithUnit.text
+    property alias enabled: textFieldWithUnit.enabled
     property alias editingFinishedFunction: textFieldWithUnit.editingFinishedFunction
 
     property string tooltipText: propertyProvider.properties.description ? propertyProvider.properties.description : ""
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index a172949812..d37150075b 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -601,8 +601,12 @@ Item
                     maximum: 99999
                     unitText: model.unit
                     decimals: model.unit == "mm" ? 2 : 0
+                    enabled: base.editingEnabled
 
-                    editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value)
+                    editingFinishedFunction: function()
+                    {
+                        materialPropertyProvider.setPropertyValue("value", parseFloat(valueText.replace(",", ".")))
+                    }
                 }
 
                 UM.ContainerPropertyProvider