diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
index c1a1eea7a7..983d2f1b92 100644
--- a/resources/qml/Menus/MaterialMenu.qml
+++ b/resources/qml/Menus/MaterialMenu.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Ultimaker B.V.
+// Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
@@ -33,9 +33,10 @@ Menu
     {
         id: materialDiameterProvider
 
-        containerStackId: Cura.MachineManager.activeMachineId
+        containerStackId: Cura.ExtruderManager.activeExtruderStackId
         key: "material_diameter"
         watchedProperties: [ "value" ]
+        storeIndex: 5
     }
 
     MenuItem
@@ -207,8 +208,8 @@ Menu
                 // Add to top section
                 var materialId = items[i].id;
                 genericMaterialsModel.append({
-                    id:materialId,
-                    name:items[i].name
+                    id: materialId,
+                    name: items[i].name
                 });
             }
             else
diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml
index c33cdbfc89..81c1bd711a 100644
--- a/resources/qml/Preferences/MaterialsPage.qml
+++ b/resources/qml/Preferences/MaterialsPage.qml
@@ -387,9 +387,10 @@ UM.ManagementPage
         {
             id: materialDiameterProvider
 
-            containerStackId: Cura.MachineManager.activeMachineId
+            containerStackId: Cura.ExtruderManager.activeExtruderStackId
             key: "material_diameter"
             watchedProperties: [ "value" ]
+            storeIndex: 5
         }
 
         UM.I18nCatalog { id: catalog; name: "cura"; }
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 5d39572647..1d4e1016bc 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -372,7 +372,7 @@ Item
                 {
                     id: provider
 
-                    containerStackId: Cura.MachineManager.activeMachineId
+                    containerStackId: Cura.ExtruderManager.activeExtruderStackId
                     key: model.key ? model.key : ""
                     watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
                     storeIndex: 0