diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py
index c552a6fe8c..2c98030cfd 100644
--- a/cura/Settings/ContainerManager.py
+++ b/cura/Settings/ContainerManager.py
@@ -118,7 +118,7 @@ class ContainerManager(QObject):
     def removeContainer(self, container_id):
         containers = self._container_registry.findContainers(id = container_id)
         if not containers:
-            Logger.log("w", "Could remove container %s because it was not found.", container_id)
+            Logger.log("w", "Could not remove container %s because it was not found.", container_id)
             return False
 
         self._container_registry.removeContainer(containers[0].getId())
diff --git a/cura/Settings/MaterialsModel.py b/cura/Settings/MaterialsModel.py
index 1b9b015108..c4b0329336 100644
--- a/cura/Settings/MaterialsModel.py
+++ b/cura/Settings/MaterialsModel.py
@@ -32,5 +32,6 @@ class MaterialsModel(InstanceContainersModel):
         result.append(item["metadata"]["material"])
         result.append(item["metadata"]["name"])
         result.append(item["metadata"]["color_name"])
+        result.append(item["metadata"]["id"])
         result.extend(super()._sortKey(item))
         return result
diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml
index cd04b79b20..c33cdbfc89 100644
--- a/resources/qml/Preferences/MaterialsPage.qml
+++ b/resources/qml/Preferences/MaterialsPage.qml
@@ -182,6 +182,7 @@ UM.ManagementPage
                 {
                     Cura.MachineManager.setActiveMaterial(material_id)
                 }
+                // TODO: this doesn't work because the source is a bit delayed
                 base.objectList.currentIndex = base.getIndexById(material_id);
             }
         },
@@ -292,10 +293,16 @@ UM.ManagementPage
                     base_file = base.currentItem.id
                 }
                 var guid = Cura.ContainerManager.getContainerMetaDataEntry(base.currentItem.id, "GUID")
+                // remove base container first, it otherwise triggers loading the base file while removing other containers
+                var base_containers = Cura.ContainerManager.findInstanceContainers({"GUID": guid, "id": base_file, "base_file": base_file, "type": "material"})
+                for(var i in base_containers)
+                {
+                    Cura.ContainerManager.removeContainer(base_containers[i]);
+                }
                 var containers = Cura.ContainerManager.findInstanceContainers({"GUID": guid, "base_file": base_file, "type": "material"})
                 for(var i in containers)
                 {
-                    Cura.ContainerManager.removeContainer(containers[i])
+                    Cura.ContainerManager.removeContainer(containers[i]);
                 }
                 if(base.objectList.currentIndex > 0)
                 {