diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml
index a8de240924..32c4773640 100644
--- a/resources/qml/Preferences/Materials/MaterialsPage.qml
+++ b/resources/qml/Preferences/Materials/MaterialsPage.qml
@@ -59,11 +59,14 @@ Item
     onCurrentItemChanged:
     {
         forceActiveFocus()
-        materialDetailsPanel.currentItem = currentItem
-        // CURA-6679 If the current item is gone after the model update, reset the current item to the active material.
-        if (currentItem == null)
+        if(materialDetailsPanel.currentItem != currentItem)
         {
-            resetExpandedActiveMaterial()
+            materialDetailsPanel.currentItem = currentItem
+            // CURA-6679 If the current item is gone after the model update, reset the current item to the active material.
+            if (currentItem == null)
+            {
+                resetExpandedActiveMaterial()
+            }
         }
     }
 
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index 0f5eba2f2f..6d5a8119c5 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -17,7 +17,7 @@ TabView
     property QtObject properties
     property var currentMaterialNode: null
 
-    property bool editingEnabled: false;
+    property bool editingEnabled: false
     property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€"
     property real firstColumnWidth: (width * 0.50) | 0
     property real secondColumnWidth: (width * 0.40) | 0